Chromium Code Reviews| 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 d566b1120887d49a2029f0d4dfa0654512d17936..f9fac86fc0c87d6227d6e5bd2c998b6dd1145350 100644 |
| --- a/third_party/WebKit/Source/web/InspectorOverlay.cpp |
| +++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp |
| @@ -81,9 +81,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, |
| @@ -234,16 +236,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. |
|
majidvp
2016/12/15 17:40:46
nit: this comment needs some revision to read well
dtapuska
2016/12/15 21:29:39
Done.
|
| + 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) { |
| @@ -757,8 +758,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) { |