From f9228b5e375b0778f6eaa40d95f2da88b5a99b7c Mon Sep 17 00:00:00 2001
From: "ojan@google.com" <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 9 Feb 2009 17:56:05 +0000
Subject: Reverting 9383.

Try again to land webkit merge.
Review URL: http://codereview.chromium.org/21173

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9393 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/JavaScriptCore/SConscript |  1 +
 webkit/build/JavaScriptCore/WTF.vcproj | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'webkit/build/JavaScriptCore')

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index f0db07a..d0d0540 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -156,6 +156,7 @@ wtf_inputs = [
     '$WTF_DIR/RandomNumber.cpp',
     '$WTF_DIR/RefCountedLeakCounter.cpp',
     '$WTF_DIR/TCSystemAlloc.cpp',
+    '$WTF_DIR/chromium/MainThreadChromium.cpp',
     '$WTF_DIR/unicode/UTF8.cpp',
     '$WTF_DIR/unicode/icu/CollatorICU.cpp',
 ]
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index b669304..9bed692 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -346,6 +346,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h"
 			>
 		</File>
@@ -381,6 +385,14 @@
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
-- 
cgit v1.1