summaryrefslogtreecommitdiffstats
path: root/WebCore/page/android
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/android')
-rw-r--r--WebCore/page/android/EventHandlerAndroid.cpp4
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;
}