| Index: Source/core/page/EventHandler.cpp
|
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
|
| index b2e91147ce635d4132727b17ed825571bf86d053..d3d7003869e802b9779418f06b71ace3c5eb1cc1 100644
|
| --- a/Source/core/page/EventHandler.cpp
|
| +++ b/Source/core/page/EventHandler.cpp
|
| @@ -69,7 +69,6 @@
|
| #include "core/page/DragController.h"
|
| #include "core/page/DragState.h"
|
| #include "core/page/EditorClient.h"
|
| -#include "core/page/EventWithHitTestResults.h"
|
| #include "core/page/FocusController.h"
|
| #include "core/page/FrameTree.h"
|
| #include "core/page/Page.h"
|
| @@ -2061,7 +2060,7 @@ bool EventHandler::handleGestureShowPress()
|
| return false;
|
| }
|
|
|
| -bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
|
| +bool EventHandler::handleGestureEvent(const GestureEventWithHitTestResults& targetedEvent)
|
| {
|
| TRACE_EVENT0("input", "EventHandler::handleGestureEvent");
|
|
|
| @@ -2072,14 +2071,12 @@ bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
|
| // the chain, doing a single-frame hit-test per frame. This matches handleWheelEvent.
|
| // Perhaps we could simplify things by rewriting scroll handling to work inner frame
|
| // out, and then unify with other gesture events.
|
| - if (gestureEvent.isScrollEvent())
|
| - return handleGestureScrollEvent(gestureEvent);
|
| + if (targetedEvent.event().isScrollEvent())
|
| + return handleGestureScrollEvent(targetedEvent.event());
|
|
|
| - // Non-scrolling related gesture events instead do a single cross-frame hit-test and
|
| - // jump directly to the inner most frame. This matches handleMousePressEvent etc.
|
| -
|
| - // Hit test across all frames and do touch adjustment as necessary for the event type.
|
| - GestureEventWithHitTestResults targetedEvent = targetGestureEvent(gestureEvent);
|
| + // Non-scrolling related gesture events instead reuse the cross-frame hit-test from
|
| + // targetedEvent and jump directly to the inner most frame. This matches
|
| + // handleMousePressEvent etc.
|
|
|
| // Route to the correct frame.
|
| if (LocalFrame* innerFrame = targetedEvent.hitTestResult().innerNodeFrame())
|
|
|