diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/page/android | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/page/android')
| -rw-r--r-- | WebCore/page/android/DragControllerAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/page/android/EventHandlerAndroid.cpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp index 7a52b56..99e18a6 100644 --- a/WebCore/page/android/DragControllerAndroid.cpp +++ b/WebCore/page/android/DragControllerAndroid.cpp @@ -43,7 +43,7 @@ DragOperation DragController::dragOperation(DragData* dragData) if (dragData->containsURL()) return DragOperationCopy; - return DragOperationNone; + return DragOperationNone; } void DragController::cleanupAfterSystemDrag() diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp index df73fe0..b52ca22 100644 --- a/WebCore/page/android/EventHandlerAndroid.cpp +++ b/WebCore/page/android/EventHandlerAndroid.cpp @@ -39,7 +39,13 @@ 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; } @@ -56,8 +62,7 @@ bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestR RenderObject* target = event.targetNode() ? event.targetNode()->renderer() : 0; if (!target || !target->isWidget()) return false; - - return passMouseDownEventToWidget(static_cast<RenderWidget*>(target)->widget()); + return passMouseDownEventToWidget(toRenderWidget(target)->widget()); } bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) |