diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 03:27:22 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 03:27:22 +0000 |
| commit | a1808527030b635ba132a1e0d5e3de22dd44b20b (patch) | |
| tree | 62dc94441cc00e8b56323ff7eee71cd3466cafdc /webkit/build | |
| parent | 52f693bfdbbe27540c1c8c6cd77678d8ff62c91f (diff) | |
| download | chromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.zip chromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.tar.gz chromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.tar.bz2 | |
non-third_party side of merge 38389:38450.
Review URL: http://codereview.chromium.org/11301
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 12 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 768d3af..38f2fd0 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -148,6 +148,7 @@ if env['PLATFORM'] == 'win32': wtf_inputs = [ '$WTF_DIR/Assertions.cpp', + '$WTF_DIR/dtoa.cpp', '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', '$WTF_DIR/MainThread.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 0dc5ef0..c4636de 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -150,6 +150,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\FastMalloc.cpp" > </File> @@ -269,6 +277,10 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StdLibExtras.h" + > + </File> <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StringExtras.h" > diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 579d049..fad9723 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -1034,10 +1034,6 @@ > </File> <File - RelativePath="..\..\port\platform\graphics\svg\SVGResourceClipperSkia.cpp" - > - </File> - <File RelativePath="..\..\port\platform\graphics\svg\SVGResourceFilterSkia.cpp" > </File> |