Index: third_party/WebKit/Source/web/InspectorOverlay.cpp |
diff --git a/third_party/WebKit/Source/web/InspectorOverlay.cpp b/third_party/WebKit/Source/web/InspectorOverlay.cpp |
index 129080c0a6b012fc65a428d098984d398a800859..672cd4931c3ddb4a8c297cf41a0eab79727dd102 100644 |
--- a/third_party/WebKit/Source/web/InspectorOverlay.cpp |
+++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp |
@@ -233,8 +233,10 @@ void InspectorOverlay::updateAllLifecyclePhases() { |
overlayMainFrame()->view()->updateAllLifecyclePhases(); |
} |
-bool InspectorOverlay::handleInputEvent(const WebInputEvent& inputEvent) { |
+bool InspectorOverlay::handleInputEvent( |
+ const CoalescedWebInputEvent& coalescedEvent) { |
bool handled = false; |
+ const WebInputEvent& inputEvent = coalescedEvent.event(); |
if (isEmpty()) |
return false; |
@@ -268,15 +270,22 @@ bool InspectorOverlay::handleInputEvent(const WebInputEvent& inputEvent) { |
if (handled) |
return true; |
- if (mouseEvent.type() == PlatformEvent::MouseMoved) |
- handled = overlayMainFrame()->eventHandler().handleMouseMoveEvent( |
- mouseEvent) != WebInputEventResult::NotHandled; |
- if (mouseEvent.type() == PlatformEvent::MousePressed) |
+ if (mouseEvent.type() == PlatformEvent::MouseMoved) { |
+ handled = |
+ overlayMainFrame()->eventHandler().handleMouseMoveEvent( |
+ mouseEvent, createPlatformMouseEventVector( |
+ m_frameImpl->frameView(), |
+ coalescedEvent.getCoalescedEventsPointers())) != |
+ WebInputEventResult::NotHandled; |
+ } |
+ if (mouseEvent.type() == PlatformEvent::MousePressed) { |
handled = overlayMainFrame()->eventHandler().handleMousePressEvent( |
mouseEvent) != WebInputEventResult::NotHandled; |
- if (mouseEvent.type() == PlatformEvent::MouseReleased) |
+ } |
+ if (mouseEvent.type() == PlatformEvent::MouseReleased) { |
handled = overlayMainFrame()->eventHandler().handleMouseReleaseEvent( |
mouseEvent) != WebInputEventResult::NotHandled; |
+ } |
} |
if (WebInputEvent::isTouchEventType(inputEvent.type)) { |
@@ -286,7 +295,10 @@ bool InspectorOverlay::handleInputEvent(const WebInputEvent& inputEvent) { |
handled = handleTouchEvent(touchEvent); |
if (handled) |
return true; |
- overlayMainFrame()->eventHandler().handleTouchEvent(touchEvent); |
+ overlayMainFrame()->eventHandler().handleTouchEvent( |
+ touchEvent, createPlatformTouchEventVector( |
+ m_frameImpl->frameView(), |
+ coalescedEvent.getCoalescedEventsPointers())); |
} |
if (WebInputEvent::isKeyboardEventType(inputEvent.type)) { |
overlayMainFrame()->eventHandler().keyEvent( |