From 6aaed0ca1a04edac5bedb7bbd0cf620ae9acb037 Mon Sep 17 00:00:00 2001
From: "dglazkov@google.com"
 <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 9 Feb 2009 22:16:22 +0000
Subject: Add Threading Support based on Chromium's MessageLoop, Chromium
 side.R=darin,brettw Review URL: http://codereview.chromium.org/19725

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9426 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/JavaScriptCore/SConscript |  8 +++-----
 webkit/build/JavaScriptCore/WTF.vcproj | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'webkit/build/JavaScriptCore')

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index d0d0540..8d810f8 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -148,6 +148,7 @@ if env.Bit('windows'):
 wtf_inputs = [
     '$WTF_DIR/ByteArray.cpp',
     '$WTF_DIR/Assertions.cpp',
+    '$WTF_DIR/chromium/MainThreadChromium.cpp',
     '$WTF_DIR/CurrentTime.cpp',
     '$WTF_DIR/dtoa.cpp',
     '$WTF_DIR/FastMalloc.cpp',
@@ -155,6 +156,8 @@ wtf_inputs = [
     '$WTF_DIR/MainThread.cpp',
     '$WTF_DIR/RandomNumber.cpp',
     '$WTF_DIR/RefCountedLeakCounter.cpp',
+    '$WTF_DIR/Threading.cpp',
+    '$WTF_DIR/ThreadingPthreads.cpp',
     '$WTF_DIR/TCSystemAlloc.cpp',
     '$WTF_DIR/chromium/MainThreadChromium.cpp',
     '$WTF_DIR/unicode/UTF8.cpp',
@@ -167,11 +170,6 @@ if env.Bit('windows'):
       '$WTF_DIR/ThreadSpecificWin.cpp',
   ])
 elif env.Bit('linux'):
-  wtf_inputs.extend([
-      '$WTF_DIR/gtk/MainThreadGtk.cpp',
-      '$WTF_DIR/ThreadingPthreads.cpp',
-  ])
-
   # Re-add the include path for glib.h because it got lost when cloning the
   # environment.
   env.ParseConfig('pkg-config --cflags --libs glib-2.0')
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 9bed692..be75e21 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -121,6 +121,18 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="chromium"
+			>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\AlwaysInline.h"
 			>
@@ -334,6 +346,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.h"
 			>
 		</File>
-- 
cgit v1.1