diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 17:56:05 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 17:56:05 +0000 |
| commit | f9228b5e375b0778f6eaa40d95f2da88b5a99b7c (patch) | |
| tree | 706ebd5881ec588be0eddd9eed3b7dc3c6cd62c6 /webkit/build/JavaScriptCore | |
| parent | 68fd131d06eec40cc25b343998da4f4db2238a90 (diff) | |
| download | chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.zip chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.tar.gz chromium_src-f9228b5e375b0778f6eaa40d95f2da88b5a99b7c.tar.bz2 | |
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
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 12 |
2 files changed, 13 insertions, 0 deletions
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> |