summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-13 22:25:36 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-13 22:25:36 +0000
commit284f00573f38d25612054e5d2f8ab2dda2802c86 (patch)
tree0e0d4f02b5959a8fc0d3fee50e2ffbfa64c8aa3e /webkit/tools
parent6061d44257cb8b334112d349bd0a32cf16fb6c68 (diff)
downloadchromium_src-284f00573f38d25612054e5d2f8ab2dda2802c86.zip
chromium_src-284f00573f38d25612054e5d2f8ab2dda2802c86.tar.gz
chromium_src-284f00573f38d25612054e5d2f8ab2dda2802c86.tar.bz2
linux: make npapi_test_plugin loadable.
We compiled before, but we'd crash with missing symbols when test_shell tried to load it. I also ported some bits of code, and added comments to the other bits that need porting. Review URL: http://codereview.chromium.org/73015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp9
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index e723c0e..3c0f3e7 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -413,14 +413,13 @@
['OS=="linux"', {
'sources!': [
# TODO(port): Port these.
- # plugin_client.cc includes not ported headers.
+
# plugin_npobject_lifetime_test.cc has win32-isms
# (HWND, CALLBACK).
- # plugin_window_size_test.cc has w32-isms including HWND.
- '../../glue/plugins/test/plugin_client.cc',
- '../../glue/plugins/test/plugin_javascript_open_popup.cc',
'../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
- '../../glue/plugins/test/plugin_private_test.cc',
+
+ # The windowed/windowless APIs are necessarily
+ # platform-specific.
'../../glue/plugins/test/plugin_window_size_test.cc',
'../../glue/plugins/test/plugin_windowless_test.cc',
],