diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 00:17:19 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 00:17:19 +0000 |
| commit | 349f6911964be4226312f970d038bdfc3339face (patch) | |
| tree | 1158ebe25a41ee9ca74c918300ec2e946c9411bd /webkit/build/JavaScriptCore | |
| parent | 5d846d975e6febb772269fabb22ddde52842a1c5 (diff) | |
| download | chromium_src-349f6911964be4226312f970d038bdfc3339face.zip chromium_src-349f6911964be4226312f970d038bdfc3339face.tar.gz chromium_src-349f6911964be4226312f970d038bdfc3339face.tar.bz2 | |
Chromium half of the WebKit merge from 39335 to 39369.
Review URL: http://codereview.chromium.org/15404
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7279 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 | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 9a3f119..2ca8ec8 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -151,6 +151,7 @@ wtf_inputs = [ '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', '$WTF_DIR/MainThread.cpp', + '$WTF_DIR/RandomNumber.cpp', '$WTF_DIR/RefCountedLeakCounter.cpp', '$WTF_DIR/TCSystemAlloc.cpp', '$WTF_DIR/unicode/UTF8.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index c4636de..5a5d7c3 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -262,6 +262,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RandomNumber.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RandomNumber.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefCounted.h" > </File> @@ -277,7 +285,7 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h" > </File> - <File + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StdLibExtras.h" > </File> |