diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-12 14:34:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-12 14:42:41 +0100 |
| commit | f387cad0dc92f856383b5200c20fb02099df4ea5 (patch) | |
| tree | 369a090508fa3c9a4c52064ee3d399e06e872f1d /WebCore/page/android | |
| parent | 617533d59d6add1e541d472502e5f956fb7baad7 (diff) | |
| download | external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.zip external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.tar.gz external_webkit-f387cad0dc92f856383b5200c20fb02099df4ea5.tar.bz2 | |
r47029: Merges WebCore/page, plugins and storage.
Diffstat (limited to 'WebCore/page/android')
| -rw-r--r-- | WebCore/page/android/EventHandlerAndroid.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp index b52ca22..ddbcdf0 100644 --- a/WebCore/page/android/EventHandlerAndroid.cpp +++ b/WebCore/page/android/EventHandlerAndroid.cpp @@ -39,13 +39,9 @@ namespace WebCore { -#ifdef MANUAL_MERGE_REQUIRED -bool EventHandler::tabsToAllControls(KeyboardEvent* ) const -#else // MANUAL_MERGE_REQUIRED unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey; bool EventHandler::tabsToAllControls(KeyboardEvent*) const -#endif // MANUAL_MERGE_REQUIRED { return true; } |