Remove PlatformTouchEvent/Point and use WebTouchEvent/Point 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 77 matching lines @@
                              ignorePointerEventsNone);
 }
 
 Node* hoveredNodeForEvent(LocalFrame* frame,
                           const PlatformMouseEvent& event,
                           bool ignorePointerEventsNone) {
   return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone);
 }
 
 Node* hoveredNodeForEvent(LocalFrame* frame,
-                          const PlatformTouchEvent& event,
+                          const WebTouchEvent& event,
                           bool ignorePointerEventsNone) {
-  const Vector<PlatformTouchPoint>& points = event.touchPoints();
-  if (!points.size())
+  if (!event.touchesLength)
     return nullptr;
-  return hoveredNodeForPoint(frame, roundedIntPoint(points[0].pos()),
+  WebTouchPoint transformedPoint = event.touchPointInRootFrame(0);
+  return hoveredNodeForPoint(frame, roundedIntPoint(transformedPoint.position),
                              ignorePointerEventsNone);
 }
 }  // namespace
 
 class InspectorOverlay::InspectorPageOverlayDelegate final
     : public PageOverlay::Delegate {
  public:
   explicit InspectorPageOverlayDelegate(InspectorOverlay& overlay)
       : m_overlay(&overlay) {}
 
@@ skipping 156 matching lines @@
     }
     if (mouseEvent.type() == PlatformEvent::MousePressed)
       handled = overlayMainFrame()->eventHandler().handleMousePressEvent(
                     mouseEvent) != WebInputEventResult::NotHandled;
     if (mouseEvent.type() == PlatformEvent::MouseReleased)
       handled = overlayMainFrame()->eventHandler().handleMouseReleaseEvent(
                     mouseEvent) != WebInputEventResult::NotHandled;
   }
 
   if (WebInputEvent::isTouchEventType(inputEvent.type())) {
-    PlatformTouchEvent touchEvent = PlatformTouchEventBuilder(
-        m_frameImpl->frameView(),
-        static_cast<const WebTouchEvent&>(inputEvent));
-    handled = handleTouchEvent(touchEvent);
+    WebTouchEvent transformedEvent =
+        TransformWebTouchEvent(m_frameImpl->frameView(),
+                               static_cast<const WebTouchEvent&>(inputEvent));
+    handled = handleTouchEvent(transformedEvent);
     if (handled)
       return true;
     overlayMainFrame()->eventHandler().handleTouchEvent(
-        touchEvent,
-        createPlatformTouchEventVector(m_frameImpl->frameView(),
-                                       std::vector<const WebInputEvent*>()));
+        transformedEvent, Vector<WebTouchEvent>());
   }
   if (WebInputEvent::isKeyboardEventType(inputEvent.type())) {
     overlayMainFrame()->eventHandler().keyEvent(
         static_cast<const WebKeyboardEvent&>(inputEvent));
   }
 
   if (inputEvent.type() == WebInputEvent::MouseWheel) {
     WebMouseWheelEvent transformedEvent = TransformWebMouseWheelEvent(
         m_frameImpl->frameView(),
         static_cast<const WebMouseWheelEvent&>(inputEvent));
@@ skipping 463 matching lines @@
     return false;
   Node* node = hoveredNodeForEvent(m_frameImpl->frame(), event, false);
   if (node && m_inspectModeHighlightConfig) {
     highlightNode(node, *m_inspectModeHighlightConfig, false);
     inspect(node);
     return true;
   }
   return false;
 }
 
-bool InspectorOverlay::handleTouchEvent(const PlatformTouchEvent& event) {
+bool InspectorOverlay::handleTouchEvent(const WebTouchEvent& event) {
   if (!shouldSearchForNode())
     return false;
   Node* node = hoveredNodeForEvent(m_frameImpl->frame(), event, false);
   if (node && m_inspectModeHighlightConfig) {
     highlightNode(node, *m_inspectModeHighlightConfig, false);
     inspect(node);
     return true;
   }
   return false;
 }
 
 bool InspectorOverlay::shouldSearchForNode() {
   return m_inspectMode != InspectorDOMAgent::NotSearching;
 }
 
 void InspectorOverlay::inspect(Node* node) {
   if (m_domAgent)
     m_domAgent->inspect(node);
 }
 
 }  // namespace blink