diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 20:39:37 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 20:39:37 +0000 |
| commit | f56a235f3f2003e6f9254df5d3b246f3229dce25 (patch) | |
| tree | e14d6f5308620b16a9ae390058219ba903a66425 /webkit | |
| parent | fad7085d5b05eb82dd38e6fbc707c8bd9a007b68 (diff) | |
| download | chromium_src-f56a235f3f2003e6f9254df5d3b246f3229dce25.zip chromium_src-f56a235f3f2003e6f9254df5d3b246f3229dce25.tar.gz chromium_src-f56a235f3f2003e6f9254df5d3b246f3229dce25.tar.bz2 | |
Move webkit\port\bridge to its proper place in WebCore, Win and Linux build.
Review URL: http://codereview.chromium.org/16457
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript.port | 4 | ||||
| -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 | 12 |
4 files changed, 7 insertions, 14 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 9fd227d..6b03896 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -25,8 +25,6 @@ elif env.Bit('linux'): )
input_files = [
- '$PORT_DIR/bridge/chromium/PluginsChromium.cpp',
-
'$PORT_DIR/page/Location.cpp',
'$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
@@ -47,6 +45,8 @@ if env.Bit('mac'): ])
if env.get('KJS'):
+ # These actually no longer exist, but since JSC build is super-broken, we'll
+ # leave them here as stark reminders of our past.
input_files.extend([
'$PORT_DIR/bridge/KJSBridge.cpp',
'$PORT_DIR/bridge/ScriptControllerKJS.cpp',
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index abe816f..ee7a85287 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -562,6 +562,7 @@ input_files = [ '$WEBCORE_DIR/plugins/PluginData.cpp', '$WEBCORE_DIR/plugins/chromium/PluginDataChromium.cpp', + '$WEBCORE_DIR/plugins/chromium/PluginsChromium.cpp', '$WEBCORE_DIR/rendering/AutoTableLayout.cpp', '$WEBCORE_DIR/rendering/bidi.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 6997b95..b035645 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -7283,6 +7283,10 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginDataChromium.cpp" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginsChromium.cpp" + > + </File> </Filter> </Filter> </Filter> diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 7350d47..0b51a4f 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -893,18 +893,6 @@ </Filter> </Filter> </Filter> - <Filter - Name="bridge" - > - <Filter - Name="chromium" - > - <File - RelativePath="..\..\port\bridge\chromium\PluginsChromium.cpp" - > - </File> - </Filter> - </Filter> </Files> <Globals> </Globals> |