Remove PlatformMouseEvent and use WebMouseEvent instead

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 79 matching lines @@
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/credentialmanager/CredentialManagerClient.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
-#include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/exported/WebActiveGestureAnimation.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
@@ skipping 438 matching lines @@
 
   mainFrameImpl()->frameView()->setDisplayMode(mode);
 }
 
 void WebViewImpl::mouseContextMenu(const WebMouseEvent& event) {
   if (!mainFrameImpl() || !mainFrameImpl()->frameView())
     return;
 
   m_page->contextMenuController().clearContextMenu();
 
-  PlatformMouseEventBuilder pme(mainFrameImpl()->frameView(), event);
+  WebMouseEvent transformedEvent =
+      TransformWebMouseEvent(mainFrameImpl()->frameView(), event);
+  IntPoint positionInRootFrame =
+      flooredIntPoint(transformedEvent.positionInRootFrame());
 
   // Find the right target frame. See issue 1186900.
-  HitTestResult result = hitTestResultForRootFramePos(pme.position());
+  HitTestResult result = hitTestResultForRootFramePos(positionInRootFrame);
   Frame* targetFrame;
   if (result.innerNodeOrImageMapImage())
     targetFrame = result.innerNodeOrImageMapImage()->document().frame();
   else
     targetFrame = m_page->focusController().focusedOrMainFrame();
 
   if (!targetFrame->isLocalFrame())
     return;
 
   LocalFrame* targetLocalFrame = toLocalFrame(targetFrame);
 
 #if OS(WIN)
   targetLocalFrame->view()->setCursor(pointerCursor());
 #endif
 
   {
     ContextMenuAllowedScope scope;
-    targetLocalFrame->eventHandler().sendContextMenuEvent(pme, nullptr);
+    targetLocalFrame->eventHandler().sendContextMenuEvent(transformedEvent,
+                                                          nullptr);
   }
   // Actually showing the context menu is handled by the ContextMenuClient
   // implementation...
 }
 
 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame,
                                 const WebMouseEvent& event) {
   PageWidgetEventHandler::handleMouseUp(mainFrame, event);
 
   if (page()->settings().getShowContextMenuOnMouseUp()) {
@@ skipping 1601 matching lines @@
         break;
       case WebInputEvent::MouseUp:
         eventType = EventTypeNames::mouseup;
         gestureIndicator = WTF::wrapUnique(
             new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
         break;
       default:
         NOTREACHED();
     }
 
-    node->dispatchMouseEvent(
-        PlatformMouseEventBuilder(
-            mainFrameImpl()->frameView(),
-            static_cast<const WebMouseEvent&>(inputEvent)),
-        eventType, static_cast<const WebMouseEvent&>(inputEvent).clickCount);
+    WebMouseEvent transformedEvent =
+        TransformWebMouseEvent(mainFrameImpl()->frameView(),
+                               static_cast<const WebMouseEvent&>(inputEvent));
+    node->dispatchMouseEvent(transformedEvent, eventType,
+                             transformedEvent.clickCount);
     return WebInputEventResult::HandledSystem;
   }
 
   // FIXME: This should take in the intended frame, not the local frame root.
   WebInputEventResult result = PageWidgetDelegate::handleInputEvent(
       *this, coalescedEvent, mainFrameImpl()->frame());
   if (result != WebInputEventResult::NotHandled)
     return result;
 
   // Unhandled pinch events should adjust the scale.
@@ skipping 1911 matching lines @@
       break;
     case WebInputEvent::MouseMove:
       eventType = EventTypeNames::mousemove;
       break;
     default:
       NOTREACHED();
   }
 
   const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
 
-  if (page())
-    page()->pointerLockController().dispatchLockedMouseEvent(
-        PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent),
-        eventType);
+  if (page()) {
+    WebMouseEvent transformedEvent =
+        TransformWebMouseEvent(mainFrameImpl()->frameView(), mouseEvent);
+    page()->pointerLockController().dispatchLockedMouseEvent(transformedEvent,
+                                                             eventType);
+  }
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail() {
   WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 void WebViewImpl::forceNextDrawingBufferCreationToFail() {
   DrawingBuffer::forceNextDrawingBufferCreationToFail();
 }
 
@@ skipping 35 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink