diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 04:08:14 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 04:08:14 +0000 |
| commit | f5d01f28f7303a06df34324e0549e6d591c5088e (patch) | |
| tree | fb54447770d34686b2c26e4575a1f952463c7b87 /webkit/tools/test_shell | |
| parent | de61d5f521eb7489a6ec82048fc63f51ef98ece6 (diff) | |
| download | chromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.zip chromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.tar.gz chromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.tar.bz2 | |
webkit/ ifdefs for BSD port; based on sprewell@jaggeri.com patch
Review URL: http://codereview.chromium.org/1483001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 9cc100f..de2d664 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -159,9 +159,9 @@ bool ApplyKeyModifier(const std::wstring& arg, WebInputEvent* event) { event->modifiers |= WebInputEvent::ShiftKey; } else if (!wcscmp(arg_string, L"altKey")) { event->modifiers |= WebInputEvent::AltKey; -#if defined(OS_WIN) || defined(OS_LINUX) +#if !defined(OS_MACOSX) // On Windows all keys with Alt modifier will be marked as system key. - // We keep the same behavior on Linux, see: + // We keep the same behavior on Linux and everywhere non-Mac, see: // third_party/WebKit/WebKit/chromium/src/gtk/WebInputEventFactory.cpp // If we want to change this behavior on Linux, this piece of code must be // kept in sync with the related code in above file. diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 2f3fa75..a569eba 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -450,12 +450,12 @@ void LayoutTestController::Reset() { if (shell_) { shell_->webView()->setZoomLevel(false, 0); shell_->webView()->setTabKeyCyclesThroughElements(true); -#if defined(OS_LINUX) +#if defined(TOOLKIT_GTK) // (Constants copied because we can't depend on the header that defined // them from this file.) shell_->webView()->setSelectionColors( 0xff1e90ff, 0xff000000, 0xffc8c8c8, 0xff323232); -#endif // defined(OS_LINUX) +#endif // defined(TOOLKIT_GTK) shell_->webView()->removeAllUserContent(); } dump_as_text_ = false; diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index d40cac0..7e4c4c1 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -673,7 +673,7 @@ ], }, }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'sources!': [ # Needs simple event record type porting '../../glue/plugins/test/plugin_windowless_test.cc', |