diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 21:37:41 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 21:37:41 +0000 |
| commit | 0598a381833f136ab211a9f566afcc854eed022e (patch) | |
| tree | 453226ecd251841211d0a1c1a9ee8f9a8e7d645c | |
| parent | 9f0ba44a96db7918e11ffa905878c16f044baa65 (diff) | |
| download | chromium_src-0598a381833f136ab211a9f566afcc854eed022e.zip chromium_src-0598a381833f136ab211a9f566afcc854eed022e.tar.gz chromium_src-0598a381833f136ab211a9f566afcc854eed022e.tar.bz2 | |
Spam port/page/Location.cpp on top of the one in WebCore/page, Win and Linux build.
Review URL: http://codereview.chromium.org/16463
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7442 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/SConscript.port | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 8 |
5 files changed, 6 insertions, 11 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7438", + "/trunk/deps/third_party/WebKit@7440", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7121", diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 6b03896..fdef9e4 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -25,8 +25,6 @@ elif env.Bit('linux'): )
input_files = [
- '$PORT_DIR/page/Location.cpp',
-
'$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
'$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
'$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ee7a85287..1fd7c9e 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -380,6 +380,7 @@ input_files = [ '$WEBCORE_DIR/page/FrameView.cpp', '$WEBCORE_DIR/page/Geolocation.cpp', '$WEBCORE_DIR/page/History.cpp', + '$WEBCORE_DIR/page/Location.cpp', '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp', '$WEBCORE_DIR/page/Navigator.cpp', '$WEBCORE_DIR/page/NavigatorBase.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index b035645..9fffc23 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -378,6 +378,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Location.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Location.h" > </File> diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 0b51a4f..ee59035 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -137,14 +137,6 @@ </References> <Files> <Filter - Name="page" - > - <File - RelativePath="..\..\port\page\Location.cpp" - > - </File> - </Filter> - <Filter Name="inspector" > <File |