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 12a59a8130fc6326c69b590deda52418b06f18b2..b1550ae2b3bda6b25e52b16f6d10255312f9e463 100644 |
--- a/third_party/WebKit/Source/web/InspectorOverlay.cpp |
+++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp |
@@ -83,9 +83,11 @@ Node* hoveredNodeForPoint(LocalFrame* frame, |
} |
Node* hoveredNodeForEvent(LocalFrame* frame, |
- const PlatformGestureEvent& event, |
+ const WebGestureEvent& event, |
bool ignorePointerEventsNone) { |
- return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone); |
+ return hoveredNodeForPoint(frame, |
+ roundedIntPoint(event.positionInRootFrame()), |
+ ignorePointerEventsNone); |
} |
Node* hoveredNodeForEvent(LocalFrame* frame, |
@@ -241,16 +243,15 @@ bool InspectorOverlay::handleInputEvent(const WebInputEvent& inputEvent) { |
if (WebInputEvent::isGestureEventType(inputEvent.type) && |
inputEvent.type == WebInputEvent::GestureTap) { |
- // Only let GestureTab in (we only need it and we know |
- // PlatformGestureEventBuilder supports it). |
- PlatformGestureEvent gestureEvent = PlatformGestureEventBuilder( |
- m_frameImpl->frameView(), |
- static_cast<const WebGestureEvent&>(inputEvent)); |
- handled = handleGestureEvent(gestureEvent); |
+ // Only let GestureTap in we only need. |
+ WebGestureEvent scaledEvent = |
+ ScaleWebGestureEvent(m_frameImpl->frameView(), |
+ static_cast<const WebGestureEvent&>(inputEvent)); |
+ handled = handleGestureEvent(scaledEvent); |
if (handled) |
return true; |
- overlayMainFrame()->eventHandler().handleGestureEvent(gestureEvent); |
+ overlayMainFrame()->eventHandler().handleGestureEvent(scaledEvent); |
} |
if (WebInputEvent::isMouseEventType(inputEvent.type) && |
inputEvent.type != WebInputEvent::MouseEnter) { |
@@ -832,8 +833,8 @@ bool InspectorOverlay::handleMousePress() { |
return false; |
} |
-bool InspectorOverlay::handleGestureEvent(const PlatformGestureEvent& event) { |
- if (!shouldSearchForNode() || event.type() != PlatformEvent::GestureTap) |
+bool InspectorOverlay::handleGestureEvent(const WebGestureEvent& event) { |
+ if (!shouldSearchForNode() || event.type != WebInputEvent::GestureTap) |
return false; |
Node* node = hoveredNodeForEvent(m_frameImpl->frame(), event, false); |
if (node && m_inspectModeHighlightConfig) { |