diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 22:16:22 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 22:16:22 +0000 |
| commit | 6aaed0ca1a04edac5bedb7bbd0cf620ae9acb037 (patch) | |
| tree | 8c81b7b6a86f01413518192d325246f6ee3ed37b /webkit/build | |
| parent | 91ecf06406432962102086445cdf9fe30d5acacb (diff) | |
| download | chromium_src-6aaed0ca1a04edac5bedb7bbd0cf620ae9acb037.zip chromium_src-6aaed0ca1a04edac5bedb7bbd0cf620ae9acb037.tar.gz chromium_src-6aaed0ca1a04edac5bedb7bbd0cf620ae9acb037.tar.bz2 | |
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
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 8 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 16 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 4 |
3 files changed, 19 insertions, 9 deletions
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> diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 6a72200..c361d64 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2629,10 +2629,6 @@ > </File> <File - RelativePath="..\..\port\bindings\v8\Threading.cpp" - > - </File> - <File RelativePath="..\..\port\bindings\v8\v8_binding.h" > </File> |