diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 00:08:15 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 00:08:15 +0000 |
| commit | 90c2c10f9d47a9ede7e17e067f5e0fe0030dbf57 (patch) | |
| tree | ac06c2942c2ad651fbc2696b5acf996730881f9f /webkit/build | |
| parent | c1e4bff3d7cfd8c386a9cd002b4bbe505233b39c (diff) | |
| download | chromium_src-90c2c10f9d47a9ede7e17e067f5e0fe0030dbf57.zip chromium_src-90c2c10f9d47a9ede7e17e067f5e0fe0030dbf57.tar.gz chromium_src-90c2c10f9d47a9ede7e17e067f5e0fe0030dbf57.tar.bz2 | |
Chrome part of WebKit merge 40297:40314
Review URL: http://codereview.chromium.org/19445
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 04b4326..553b45e 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -432,7 +432,7 @@ input_files = [ '$WEBCORE_DIR/platform/DragImage.cpp', '$WEBCORE_DIR/platform/FileChooser.cpp', '$WEBCORE_DIR/platform/GeolocationService.cpp', - '$WEBCORE_DIR/platform/GKURL.cpp', + '$WEBCORE_DIR/platform/KURLGoogle.cpp', '$WEBCORE_DIR/platform/Length.cpp', '$WEBCORE_DIR/platform/LinkHash.cpp', '$WEBCORE_DIR/platform/Logging.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 9e87138..d343e99 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1051,10 +1051,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GKURL.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h" > </File> @@ -1067,15 +1063,19 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GoogleURLPrivate.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURLGoogle.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURLGooglePrivate.h" > </File> <File |