Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 80 insertions, 12 deletions

diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
index 9af2266..f4639a9 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -153,11 +153,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\kjs\collector.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pending\kjs\collector.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.h"
 				>
 			</File>
 			<File
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 3c4c36c..ba5cb99 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -57,6 +57,35 @@ cpp = env.Command(['grammar.cpp', 'grammar.h'],
                   YACCFLAGS = '-d -p kjsyy')
 env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/grammar.hpp'))
 
+copies = [
+    'API/APICast.h',
+    'API/JSBase.h',
+    'API/JSValueRef.h',
+    'API/JSObjectRef.h',
+    'API/JSRetainPtr.h',
+    'API/JSContextRef.h',
+    'API/JSStringRef.h',
+    'API/JSStringRefCF.h',
+    'API/JSStringRefBSTR.h',
+    'API/JavaScriptCore.h',
+    'bindings/npruntime.h',
+    'bindings/runtime.h',
+    'bindings/NP_jsobject.h',
+    'bindings/npruntime_internal.h',
+    'bindings/npruntime_impl.h',
+    'bindings/runtime_object.h',
+    'bindings/runtime_root.h',
+    'kjs/collector.h',
+    'kjs/JSLock.h',
+    'kjs/interpreter.h',
+    'wtf/HashCountedSet.h',
+]
+
+JSCORE_OUT = '$WEBKIT_DIR/scons/WebCore/JavaScriptCore'
+
+for c in copies:
+  i = env.Install(JSCORE_OUT, '$JAVASCRIPTCORE_DIR/' + c)
+  env.Alias('webkit', i)
 
 # Stuff for WTF
 env = env.Clone(
@@ -79,7 +108,6 @@ env = env.Clone(
 
 env.Append(
     CPPDEFINES = [
-        'HAVE_CONFIG_H',
         '__STD_C',
         'U_STATIC_IMPLEMENTATION',
         ]
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 61d9269..6de37ee 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -126,6 +126,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ASCIICType.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Assertions.cpp"
 			>
 		</File>
@@ -138,7 +142,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\pending\wtf\FastMalloc.h"
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\FastMalloc.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\FastMalloc.h"
 			>
 		</File>
 		<File
@@ -182,6 +190,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\MainThread.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\MainThread.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\pending\wtf\MathExtras.h"
 			>
 		</File>
@@ -202,7 +218,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\pending\wtf\Platform.h"
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Platform.h"
 			>
 		</File>
 		<File
@@ -230,7 +246,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefCounted.h"
+			RelativePath="..\..\pending\wtf\RefCounted.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefCountedLeakCounter.cpp"
 			>
 		</File>
 		<File
@@ -238,7 +258,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h"
+			RelativePath="..\..\pending\wtf\RefPtrHashMap.h"
 			>
 		</File>
 		<File
@@ -266,10 +286,26 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\pending\wtf\ThreadingWin.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Unicode.h"
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\UnicodeIcu.h"
 			>
 		</File>
@@ -293,6 +329,10 @@
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\win\MainThreadWin.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/webkit/build/JavaScriptCore/copy_files.bat b/webkit/build/JavaScriptCore/copy_files.bat
index 8079609..d1c6e2c 100644
--- a/webkit/build/JavaScriptCore/copy_files.bat
+++ b/webkit/build/JavaScriptCore/copy_files.bat
@@ -23,7 +23,7 @@ xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\npruntime_impl.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\runtime_object.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\runtime_root.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\JSLock.h" %DIR%
-xcopy /y /d "..\..\pending\kjs\collector.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\collector.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\interpreter.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\wtf\HashCountedSet.h" %DIR%
 
diff --git a/webkit/build/JavaScriptCore/javascriptcore.vsprops b/webkit/build/JavaScriptCore/javascriptcore.vsprops
index 58fd97c..d9056ce 100644
--- a/webkit/build/JavaScriptCore/javascriptcore.vsprops
+++ b/webkit/build/JavaScriptCore/javascriptcore.vsprops
@@ -14,6 +14,6 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(IntDir)&quot;;&quot;$(IntDir)\DerivedSources&quot;;../../../third_party/WebKit/JavaScriptCore;&quot;../../../third_party/WebKit/JavaScriptCore/os-win32&quot;;../../../third_party/WebKit/JavaScriptCore/pcre;../../../third_party/WebKit/JavaScriptCore/kjs;../../../third_party/WebKit/JavaScriptCore/wtf;../../../third_party/WebKit/JavaScriptCore/API;../../../third_party/WebKit/JavaScriptCore/bindings;../../../third_party/WebKit/JavaScriptCore/bindings/c;../../../third_party/WebKit/JavaScriptCore/bindings/jni;../../pending;../../pending/kjs;../../pending/wtf"
-		PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C"
+		PreprocessorDefinitions="__STD_C"
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/build/JavaScriptCore/wtf.vsprops b/webkit/build/JavaScriptCore/wtf.vsprops
index f954882..fcf66ef 100644
--- a/webkit/build/JavaScriptCore/wtf.vsprops
+++ b/webkit/build/JavaScriptCore/wtf.vsprops
@@ -3,13 +3,13 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="wtf"
-	InheritedPropertySheets="$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\common.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\common.vsprops;..\webkit_common_defines.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(ProjectDir);&quot;$(IntDir)&quot;;&quot;../../../third_party/WebKit/JavaScriptCore&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/os-win32&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/kjs&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/wtf&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/API&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings/c&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings/jni&quot;;../../pending;../../pending/wtf"
-		PreprocessorDefinitions="HAVE_CONFIG_H;__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;CRASH=__debugbreak"
+		AdditionalIncludeDirectories="$(ProjectDir);&quot;$(IntDir)&quot;;&quot;../../../third_party/WebKit/JavaScriptCore&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/os-win32&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/kjs&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/wtf&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/wtf/unicode&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/API&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings/c&quot;;&quot;../../../third_party/WebKit/JavaScriptCore/bindings/jni&quot;;../../pending;../../pending/wtf"
+		PreprocessorDefinitions="__STD_C;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;CRASH=__debugbreak"
 		DisableSpecificWarnings="4127; 4355; 4510; 4512; 4610; 4706"
 	/>
 </VisualStudioPropertySheet>