diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 17:46:36 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 17:46:36 +0000 |
| commit | dabbeb8b81e3712b1b2c2d5a8b76831f64995b35 (patch) | |
| tree | 74334d5dd10e8ab4013aaca37b8d65d3d87764a6 /webkit/tools/test_shell | |
| parent | 2975326eca211f79a410ea4865d7ed333a1be716 (diff) | |
| download | chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.zip chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.tar.gz chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.tar.bz2 | |
Enable windowless-based npapi_test_plugin tests on the Mac.
BUG=30488
TEST=N/A
Review URL: http://codereview.chromium.org/501074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 786d4a2..1b5ff01 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -632,11 +632,9 @@ # plugin_npobject_lifetime_test.cc has win32-isms # (HWND, CALLBACK). '../../glue/plugins/test/plugin_npobject_lifetime_test.cc', - # The windowed/windowless APIs are necessarily - # platform-specific. + # The window APIs are necessarily platform-specific. '../../glue/plugins/test/plugin_window_size_test.cc', '../../glue/plugins/test/plugin_windowed_test.cc', - '../../glue/plugins/test/plugin_windowless_test.cc', # Seems windows specific. '../../glue/plugins/test/plugin_create_instance_in_paint.cc', '../../glue/plugins/test/plugin_create_instance_in_paint.h', @@ -653,6 +651,12 @@ ], }, }], + ['OS=="linux"', { + 'sources!': [ + # Needs simple event record type porting + '../../glue/plugins/test/plugin_windowless_test.cc', + ], + }], ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] |