| Index: third_party/WebKit/Source/core/input/GestureManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/GestureManager.cpp b/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| index a1aa32035c43f8a94b42d338232d25da45742e57..ad22db464738084c3b2cb552edf5a26a3bc77df2 100644
|
| --- a/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| +++ b/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| @@ -12,6 +12,7 @@
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/VisualViewport.h"
|
| #include "core/input/EventHandler.h"
|
| +#include "core/input/EventHandlingUtil.h"
|
| #include "core/page/ChromeClient.h"
|
| #include "core/page/Page.h"
|
|
|
| @@ -87,7 +88,7 @@ WebInputEventResult GestureManager::handleGestureEventInFrame(const GestureEvent
|
| DispatchEventResult gestureDomEventResult = eventTarget->dispatchEvent(gestureDomEvent);
|
| if (gestureDomEventResult != DispatchEventResult::NotCanceled) {
|
| DCHECK(gestureDomEventResult != DispatchEventResult::CanceledByEventHandler);
|
| - return EventHandler::toWebInputEventResult(gestureDomEventResult);
|
| + return EventHandlingUtil::toWebInputEventResult(gestureDomEventResult);
|
| }
|
| }
|
| }
|
| @@ -162,7 +163,7 @@ WebInputEventResult GestureManager::handleGestureTap(const GestureEventWithHitTe
|
| if (mainFrame && mainFrame->view())
|
| mainFrame->view()->updateLifecycleToCompositingCleanPlusScrolling();
|
| adjustedPoint = frameView->rootFrameToContents(gestureEvent.position());
|
| - currentHitTest = EventHandler::hitTestResultInFrame(m_frame, adjustedPoint, hitType);
|
| + currentHitTest = EventHandlingUtil::hitTestResultInFrame(m_frame, adjustedPoint, hitType);
|
| }
|
|
|
| // Capture data for showUnhandledTapUIIfNeeded.
|
| @@ -205,7 +206,7 @@ WebInputEventResult GestureManager::handleGestureTap(const GestureEventWithHitTe
|
| if (mainFrame && mainFrame->view())
|
| mainFrame->view()->updateAllLifecyclePhases();
|
| adjustedPoint = frameView->rootFrameToContents(gestureEvent.position());
|
| - currentHitTest = EventHandler::hitTestResultInFrame(m_frame, adjustedPoint, hitType);
|
| + currentHitTest = EventHandlingUtil::hitTestResultInFrame(m_frame, adjustedPoint, hitType);
|
| }
|
|
|
| PlatformMouseEvent fakeMouseUp(gestureEvent.position(), gestureEvent.globalPosition(),
|
| @@ -235,7 +236,7 @@ WebInputEventResult GestureManager::handleGestureTap(const GestureEventWithHitTe
|
| mouseUpEventResult = m_frame->eventHandler().handleMouseReleaseEvent(MouseEventWithHitTestResults(fakeMouseUp, currentHitTest));
|
| m_frame->eventHandler().clearDragHeuristicState();
|
|
|
| - WebInputEventResult eventResult = EventHandler::mergeEventResult(EventHandler::mergeEventResult(mouseDownEventResult, mouseUpEventResult), clickEventResult);
|
| + WebInputEventResult eventResult = EventHandlingUtil::mergeEventResult(EventHandlingUtil::mergeEventResult(mouseDownEventResult, mouseUpEventResult), clickEventResult);
|
| if (eventResult == WebInputEventResult::NotHandled && tappedNode && m_frame->page()) {
|
| bool domTreeChanged = preDispatchDomTreeVersion != m_frame->document()->domTreeVersion();
|
| bool styleChanged = preDispatchStyleVersion != m_frame->document()->styleVersion();
|
|
|