From d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jan 2012 10:03:25 +0100
Subject: Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3
 (http://svn.webkit.org/repository/webkit/trunk@104681)

---
 .../JavaScriptCore/JavaScriptCore.def              |  3 +-
 .../JavaScriptCore/JavaScriptCore.vcproj           | 52 ++++++++++++++++++++++
 .../JavaScriptCore.vcproj/WTF/WTF.vcproj           |  4 --
 3 files changed, 54 insertions(+), 5 deletions(-)

(limited to 'Source/JavaScriptCore/JavaScriptCore.vcproj')

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index 9ee61eaab..577329e94 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -296,12 +296,12 @@ EXPORTS
     ?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVUString@2@AAVJSValue@2@@Z
     ?s_globalObjectMethodTable@JSGlobalObject@JSC@@1UGlobalObjectMethodTable@2@B
     ?s_info@ExecutableBase@JSC@@2UClassInfo@2@B
+    ?s_info@JSString@JSC@@2UClassInfo@2@B
     ?setConfigurable@PropertyDescriptor@JSC@@QAEX_N@Z
     ?setDescriptor@PropertyDescriptor@JSC@@QAEXVJSValue@2@I@Z
     ?setDumpsGeneratedCode@BytecodeGenerator@JSC@@SAX_N@Z
     ?setEnumerable@PropertyDescriptor@JSC@@QAEX_N@Z
     ?setGetter@PropertyDescriptor@JSC@@QAEXVJSValue@2@@Z
-    ?setLength@JSArray@JSC@@QAEXI@Z
     ?setLoc@StatementNode@JSC@@QAEXHH@Z
     ?setMainThreadCallbacksPaused@WTF@@YAX_N@Z
     ?setOrderLowerFirst@Collator@WTF@@QAEX_N@Z
@@ -336,6 +336,7 @@ EXPORTS
     ?timedWait@ThreadCondition@WTF@@QAE_NAAVMutex@2@N@Z
     ?tlsKeyCount@WTF@@YAAAJXZ
     ?tlsKeys@WTF@@YAPAKXZ
+    ?toBoolean@JSString@JSC@@QBE_NPAVExecState@2@@Z
     ?toInt32@JSC@@YAHN@Z
     ?toInteger@JSValue@JSC@@QBENPAVExecState@2@@Z
     ?toNumberSlowCase@JSValue@JSC@@ABENPAVExecState@2@@Z
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 888269623..8fd3c8ab0 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -593,6 +593,10 @@
 				RelativePath="..\..\runtime\CommonIdentifiers.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\runtime\CommonSlowPaths.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\runtime\Completion.cpp"
 				>
@@ -1445,6 +1449,46 @@
 		<Filter
 			Name="bytecode"
 			>
+			<File
+				RelativePath="..\..\bytecode\HandlerInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CallLinkInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\LineInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\MethodCallLinkInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CallReturnOffsetToBytecodeOffset.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeType.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\ExpressionRangeInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\MethodCallLinkInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CallLinkInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\GlobalResolveInfo.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\bytecode\CodeBlock.cpp"
 				>
@@ -1705,6 +1749,14 @@
 				RelativePath="..\..\jit\JITStubCall.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\jit\JITExceptions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\jit\JITExceptions.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\jit\JITStubs.cpp"
 				>
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 6491d00e1..6e89b0167 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -964,10 +964,6 @@
 			RelativePath="..\..\wtf\OwnArrayPtr.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\wtf\OwnFastMallocPtr.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\wtf\OwnPtr.h"
 			>
-- 
cgit v1.2.3