diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 01:31:20 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 01:31:20 +0000 |
| commit | 459c700eb320d8bb3d43dbf0607044d794bda4d7 (patch) | |
| tree | 9b05d648b63f7603293118125a12337e14eb8742 /webkit/webkit.gyp | |
| parent | c4a0cda0f19ce2c19edb0742832953ae846bf821 (diff) | |
| download | chromium_src-459c700eb320d8bb3d43dbf0607044d794bda4d7.zip chromium_src-459c700eb320d8bb3d43dbf0607044d794bda4d7.tar.gz chromium_src-459c700eb320d8bb3d43dbf0607044d794bda4d7.tar.bz2 | |
plugins: unfork WebPluginDelegateImpl between linux/win
Algorithm:
- copy win to shared
- for each diff between shared and lin, delete/refactor shared
- for each diff between shared and lin, delete in lin
- for each diff between shared and win, delete in win
The change should be mostly deletes.
Please verify that I didn't change any behavior on Windows or GTK.
Note: coincidentally, this change also fixes a bug that we've seen
on Linux that was fixed in the Windows version of the file. I only
noticed it because the Windows/Linux files differed, but after this
unforking the change is now in the shared code.
Mac shouldn't be too hard to do too.
Review URL: http://codereview.chromium.org/174479
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index e27c8c7..bf03e1d 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1339,6 +1339,7 @@ 'glue/plugins/webplugin_delegate_impl.h', 'glue/plugins/webplugin_delegate_impl_gtk.cc', 'glue/plugins/webplugin_delegate_impl_mac.mm', + 'glue/plugins/webplugin_delegate_impl_win.cc', 'glue/alt_error_page_resource_fetcher.cc', 'glue/alt_error_page_resource_fetcher.h', 'glue/autofill_form.cc', @@ -1492,22 +1493,20 @@ }], ['OS!="mac"', { 'sources/': [['exclude', '_mac\\.(cc|mm)$']] + }, { # else: OS=="mac" + 'sources!': [ + # TODO(port): Unfork webplugin_delegate_impl_mac and this file. + 'glue/plugins/webplugin_delegate_impl.cc', + ], }], ['OS!="win"', { 'sources/': [['exclude', '_win\\.cc$']], 'sources!': [ - # TODO(port): Mac uses webplugin_delegate_impl_mac.cc and GTK uses - # webplugin_delegate_impl_gtk.cc. Seems like this should be - # renamed webplugin_delegate_impl_win.cc, then we could get rid - # of the explicit exclude. - 'glue/plugins/webplugin_delegate_impl.cc', - # These files are Windows-only now but may be ported to other # platforms. 'glue/glue_accessibility_object.cc', 'glue/glue_accessibility_object.h', 'glue/plugins/mozilla_extensions.cc', - 'glue/plugins/webplugin_delegate_impl.cc', 'glue/webaccessibility.h', 'glue/webaccessibilitymanager.h', 'glue/webaccessibilitymanager_impl.cc', |