From 32ea33253afbbdefd2680aa95ab5f57455272ae7 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 30 Nov 2012 16:58:06 +0100
Subject: Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601
 (http://svn.webkit.org/repository/webkit/trunk@136242)

Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split

Extra fixes will be cherry-picked.

Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 .../JavaScriptCore/JavaScriptCore.def              |  1 -
 .../JavaScriptCore/JavaScriptCore.vcproj           | 32 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

(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 7aa5673d8..422aac464 100755
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -340,7 +340,6 @@ EXPORTS
     ?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVString@WTF@@AAVJSValue@2@@Z
     ?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
     ?setGarbageCollectionTimerEnabled@Heap@JSC@@QAEX_N@Z
     ?setGetter@PropertyDescriptor@JSC@@QAEXVJSValue@2@@Z
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index d26a3b645..e8eda62f9 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -645,6 +645,14 @@
 				RelativePath="..\..\runtime\CodeCache.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\runtime\CodeSpecializationKind.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\runtime\CodeSpecializationKind.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\runtime\CommonIdentifiers.cpp"
 				>
@@ -1629,6 +1637,22 @@
 				RelativePath="..\..\bytecode\CodeBlock.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeBlockHash.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeBlockHash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeBlockWithJITType.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeOrigin.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\bytecode\CodeOrigin.h"
 				>
@@ -1637,6 +1661,10 @@
 				RelativePath="..\..\bytecode\CodeType.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\bytecode\CodeType.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\bytecode\Comment.h"
 				>
@@ -1981,6 +2009,10 @@
 				RelativePath="..\..\jit\JITCall32_64.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\jit\JITCode.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\jit\JITCode.h"
 				>
-- 
cgit v1.2.3