Remove PlatformMouseEvent and use WebMouseEvent instead

third_party/WebKit/Source/web/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 71 matching lines @@
 
 Node* hoveredNodeForEvent(LocalFrame* frame,
                           const WebGestureEvent& event,
                           bool ignorePointerEventsNone) {
   return hoveredNodeForPoint(frame,
                              roundedIntPoint(event.positionInRootFrame()),
                              ignorePointerEventsNone);
 }
 
 Node* hoveredNodeForEvent(LocalFrame* frame,
-                          const PlatformMouseEvent& event,
+                          const WebMouseEvent& event,
                           bool ignorePointerEventsNone) {
-  return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone);
+  return hoveredNodeForPoint(frame,
+                             roundedIntPoint(event.positionInRootFrame()),
+                             ignorePointerEventsNone);
 }
 
 Node* hoveredNodeForEvent(LocalFrame* frame,
                           const WebTouchEvent& event,
                           bool ignorePointerEventsNone) {
   if (!event.touchesLength)
     return nullptr;
   WebTouchPoint transformedPoint = event.touchPointInRootFrame(0);
   return hoveredNodeForPoint(frame, roundedIntPoint(transformedPoint.position),
                              ignorePointerEventsNone);
@@ skipping 133 matching lines @@
     // We only have a use for gesture tap.
     WebGestureEvent transformedEvent = TransformWebGestureEvent(
         m_frameImpl->frameView(),
         static_cast<const WebGestureEvent&>(inputEvent));
     handled = handleGestureEvent(transformedEvent);
     if (handled)
       return true;
 
     overlayMainFrame()->eventHandler().handleGestureEvent(transformedEvent);
   }
-  if (WebInputEvent::isMouseEventType(inputEvent.type()) &&
-      inputEvent.type() != WebInputEvent::MouseEnter) {
-    // PlatformMouseEventBuilder does not work with MouseEnter type, so we
-    // filter it out manually.
-    PlatformMouseEvent mouseEvent = PlatformMouseEventBuilder(
-        m_frameImpl->frameView(),
-        static_cast<const WebMouseEvent&>(inputEvent));
+  if (WebInputEvent::isMouseEventType(inputEvent.type())) {
+    WebMouseEvent mouseEvent =
+        TransformWebMouseEvent(m_frameImpl->frameView(),
+                               static_cast<const WebMouseEvent&>(inputEvent));
 
-    if (mouseEvent.type() == PlatformEvent::MouseMoved)
+    if (mouseEvent.type() == WebInputEvent::MouseMove)
       handled = handleMouseMove(mouseEvent);
-    else if (mouseEvent.type() == PlatformEvent::MousePressed)
+    else if (mouseEvent.type() == WebInputEvent::MouseDown)
       handled = handleMousePress();
 
     if (handled)
       return true;
 
-    if (mouseEvent.type() == PlatformEvent::MouseMoved) {
+    if (mouseEvent.type() == WebInputEvent::MouseMove) {
       handled = overlayMainFrame()->eventHandler().handleMouseMoveEvent(
-                    mouseEvent, createPlatformMouseEventVector(
+                    mouseEvent, TransformWebMouseEventVector(
                                     m_frameImpl->frameView(),
                                     std::vector<const WebInputEvent*>())) !=
                 WebInputEventResult::NotHandled;
     }
-    if (mouseEvent.type() == PlatformEvent::MousePressed)
+    if (mouseEvent.type() == WebInputEvent::MouseDown)
       handled = overlayMainFrame()->eventHandler().handleMousePressEvent(
                     mouseEvent) != WebInputEventResult::NotHandled;
-    if (mouseEvent.type() == PlatformEvent::MouseReleased)
+    if (mouseEvent.type() == WebInputEvent::MouseUp)
       handled = overlayMainFrame()->eventHandler().handleMouseReleaseEvent(
                     mouseEvent) != WebInputEventResult::NotHandled;
   }
 
   if (WebInputEvent::isTouchEventType(inputEvent.type())) {
     WebTouchEvent transformedEvent =
         TransformWebTouchEvent(m_frameImpl->frameView(),
                                static_cast<const WebTouchEvent&>(inputEvent));
     handled = handleTouchEvent(transformedEvent);
     if (handled)
@@ skipping 414 matching lines @@
     m_resizeTimerActive = true;
     m_timer.startOneShot(1, BLINK_FROM_HERE);
   }
   scheduleUpdate();
 }
 
 void InspectorOverlay::setShowViewportSizeOnResize(bool show) {
   m_drawViewSize = show;
 }
 
-bool InspectorOverlay::handleMouseMove(const PlatformMouseEvent& event) {
+bool InspectorOverlay::handleMouseMove(const WebMouseEvent& event) {
   if (!shouldSearchForNode())
     return false;
 
   LocalFrame* frame = m_frameImpl->frame();
   if (!frame || !frame->view() || frame->contentLayoutItem().isNull())
     return false;
-  Node* node = hoveredNodeForEvent(frame, event, event.shiftKey());
+  Node* node = hoveredNodeForEvent(frame, event,
+                                   event.modifiers() & WebInputEvent::ShiftKey);
 
   // Do not highlight within user agent shadow root unless requested.
   if (m_inspectMode != InspectorDOMAgent::SearchingForUAShadow) {
     ShadowRoot* shadowRoot = InspectorDOMAgent::userAgentShadowRoot(node);
     if (shadowRoot)
       node = &shadowRoot->host();
   }
 
   // Shadow roots don't have boxes - use host element instead.
   if (node && node->isShadowRoot())
     node = node->parentOrShadowHostNode();
 
   if (!node)
     return true;
 
-  Node* eventTarget =
-      event.shiftKey() ? hoveredNodeForEvent(frame, event, false) : nullptr;
+  Node* eventTarget = (event.modifiers() & WebInputEvent::ShiftKey)
+                          ? hoveredNodeForEvent(frame, event, false)
+                          : nullptr;
   if (eventTarget == node)
     eventTarget = nullptr;
 
   if (node && m_inspectModeHighlightConfig) {
     m_hoveredNodeForInspectMode = node;
     if (m_domAgent)
       m_domAgent->nodeHighlightedInOverlay(node);
     highlightNode(node, eventTarget, *m_inspectModeHighlightConfig,
-                  event.ctrlKey() || event.metaKey());
+                  (event.modifiers() &
+                   (WebInputEvent::ControlKey | WebInputEvent::MetaKey)));
   }
   return true;
 }
 
 bool InspectorOverlay::handleMousePress() {
   if (!shouldSearchForNode())
     return false;
 
   if (m_hoveredNodeForInspectMode) {
     inspect(m_hoveredNodeForInspectMode.get());
@@ skipping 30 matching lines @@
 bool InspectorOverlay::shouldSearchForNode() {
   return m_inspectMode != InspectorDOMAgent::NotSearching;
 }
 
 void InspectorOverlay::inspect(Node* node) {
   if (m_domAgent)
     m_domAgent->inspect(node);
 }
 
 }  // namespace blink