diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 21:04:04 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 21:04:04 +0000 |
| commit | 3ebf9af0cd55de5d312f0df5254580ab60ac0c64 (patch) | |
| tree | 9d332e0833925545f0cdce851e349a9b109626b6 /webkit/tools/test_shell/test_shell.gyp | |
| parent | 076bf0b69eafa42accb20e5ccfe23805ed91655d (diff) | |
| download | chromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.zip chromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.tar.gz chromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.tar.bz2 | |
Fixing WebKeyboardEvent.
Review URL: http://codereview.chromium.org/39075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.gyp')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index ba4c145..cefe517 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -82,7 +82,15 @@ ], 'conditions': [ ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}], - ['OS!="mac"', { + ['OS=="mac"', { + 'sources': [ + # Windows/Linux use this code normally when constructing events, so + # in test_shell they get it from glue. The Mac has its own code for + # accomplishing it, so in test_shell, where events are constructed + # from scratch, we need to pull this in. + '../../glue/webinputevent_util.cc', + ] + }, { # else: OS!=mac 'sources/': [ ['exclude', 'mac/[^/]*\\.(cc|mm?)$'], ['exclude', '_mac\\.(cc|mm?)$'], @@ -98,7 +106,7 @@ 'dependencies': [ '../../../breakpad/breakpad.gyp:breakpad_handler', ], - }, { # OS!=win + }, { # else: OS!=win 'sources/': [ ['exclude', '_win\\.cc$'] ], @@ -191,7 +199,7 @@ }], ['OS=="win"', { 'msvs_disabled_warnings': [ 4800 ], - }, { # OS!=win + }, { # else: OS!=win 'sources!': [ '../../../skia/ext/vector_canvas_unittest.cc', '../webcore_unit_tests/UniscribeHelper_unittest.cpp', |