Remove PlatformMouseEvent and use WebMouseEvent instead

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 61 matching lines @@
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/page/Page.h"
 #include "core/page/ScopedPageSuspender.h"
 #include "core/paint/PaintLayer.h"
 #include "core/testing/NullExecutionContext.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "platform/Cursor.h"
 #include "platform/DragImage.h"
-#include "platform/PlatformMouseEvent.h"
 #include "platform/PlatformResourceLoader.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/loader/fetch/FetchRequest.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 #include "platform/network/ResourceError.h"
 #include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarTestSuite.h"
@@ skipping 6773 matching lines @@
   TestNavigationPolicyWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html",
                                   true, &client);
 
   Document* document =
       toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
   KURL destination = document->url();
   destination.setFragmentIdentifier("test");
 
-  Event* event = MouseEvent::create(
-      EventTypeNames::click, false, false, document->domWindow(), 0, 0, 0, 0, 0,
-      0, 0, PlatformEvent::NoModifiers, 1, 0, nullptr, TimeTicks(),
-      PlatformMouseEvent::RealOrIndistinguishable, String(), nullptr);
+  MouseEventInit mouseInitializer;
+  mouseInitializer.setView(document->domWindow());
+  mouseInitializer.setButton(1);
+
+  Event* event =
+      MouseEvent::create(nullptr, EventTypeNames::click, mouseInitializer);
   FrameLoadRequest frameRequest(document, ResourceRequest(destination));
   frameRequest.setTriggeringEvent(event);
   toLocalFrame(webViewHelper.webView()->page()->mainFrame())
       ->loader()
       .load(frameRequest);
 }
 
 class TestNewWindowWebViewClient : public FrameTestHelpers::TestWebViewClient {
  public:
   virtual WebView* createView(WebLocalFrame*,
@@ skipping 31 matching lines @@
   TestNewWindowWebFrameClient webFrameClient;
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "ctrl_click.html", true,
                                   &webFrameClient, &webViewClient);
 
   Document* document =
       toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
   KURL destination = toKURL(m_baseURL + "hello_world.html");
 
   // ctrl+click event
-  Event* event = MouseEvent::create(
-      EventTypeNames::click, false, false, document->domWindow(), 0, 0, 0, 0, 0,
-      0, 0, PlatformEvent::CtrlKey, 0, 0, nullptr, TimeTicks(),
-      PlatformMouseEvent::RealOrIndistinguishable, String(), nullptr);
+  MouseEventInit mouseInitializer;
+  mouseInitializer.setView(document->domWindow());
+  mouseInitializer.setButton(1);
+  mouseInitializer.setCtrlKey(true);
+
+  Event* event =
+      MouseEvent::create(nullptr, EventTypeNames::click, mouseInitializer);
   FrameLoadRequest frameRequest(document, ResourceRequest(destination));
   frameRequest.setTriggeringEvent(event);
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   toLocalFrame(webViewHelper.webView()->page()->mainFrame())
       ->loader()
       .load(frameRequest);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
 
   // decidePolicyForNavigation should be called both for the original request
@@ skipping 3845 matching lines @@
 
   Document* document = webView->mainFrameImpl()->frame()->document();
   Element* div1Tag = document->getElementById("div1");
 
   HitTestResult hitTestResult = webView->coreHitTestResultAt(
       WebPoint(div1Tag->offsetLeft() + 5, div1Tag->offsetTop() + 5));
 
   EXPECT_TRUE(hitTestResult.innerElement());
 
   // Mouse over link. Mouse cursor should be hand.
-  PlatformMouseEvent mouseMoveOverLinkEvent(
-      IntPoint(div1Tag->offsetLeft() + 5, div1Tag->offsetTop() + 5),
-      IntPoint(div1Tag->offsetLeft() + 5, div1Tag->offsetTop() + 5),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveOverLinkEvent(
+      WebInputEvent::MouseMove,
+      WebFloatPoint(div1Tag->offsetLeft() + 5, div1Tag->offsetTop() + 5),
+      WebFloatPoint(div1Tag->offsetLeft() + 5, div1Tag->offsetTop() + 5),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveOverLinkEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveOverLinkEvent, Vector<PlatformMouseEvent>());
+      mouseMoveOverLinkEvent, Vector<WebMouseEvent>());
 
   EXPECT_EQ(document->hoverNode(),
             document->frame()->chromeClient().lastSetTooltipNodeForTesting());
   EXPECT_EQ(div1Tag,
             document->frame()->chromeClient().lastSetTooltipNodeForTesting());
 
   Element* div2Tag = document->getElementById("div2");
 
-  PlatformMouseEvent mouseMoveEvent(
-      IntPoint(div2Tag->offsetLeft() + 5, div2Tag->offsetTop() + 5),
-      IntPoint(div2Tag->offsetLeft() + 5, div2Tag->offsetTop() + 5),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveEvent(
+      WebInputEvent::MouseMove,
+      WebFloatPoint(div2Tag->offsetLeft() + 5, div2Tag->offsetTop() + 5),
+      WebFloatPoint(div2Tag->offsetLeft() + 5, div2Tag->offsetTop() + 5),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveEvent, Vector<PlatformMouseEvent>());
+      mouseMoveEvent, Vector<WebMouseEvent>());
 
   EXPECT_EQ(document->hoverNode(),
             document->frame()->chromeClient().lastSetTooltipNodeForTesting());
   EXPECT_EQ(div2Tag,
             document->frame()->chromeClient().lastSetTooltipNodeForTesting());
 }
 
 // Makes sure that mouse hover over an overlay scrollbar doesn't activate
 // elements below unless the scrollbar is faded out.
 TEST_F(WebFrameTest, MouseOverLinkAndOverlayScrollbar) {
@@ skipping 20 matching lines @@
   // Ensure hittest has scrollbar and link
   HitTestResult hitTestResult =
       webView->coreHitTestResultAt(WebPoint(18, aTag->offsetTop()));
 
   EXPECT_TRUE(hitTestResult.URLElement());
   EXPECT_TRUE(hitTestResult.innerElement());
   EXPECT_TRUE(hitTestResult.scrollbar());
   EXPECT_FALSE(hitTestResult.scrollbar()->isCustomScrollbar());
 
   // Mouse over link. Mouse cursor should be hand.
-  PlatformMouseEvent mouseMoveOverLinkEvent(
-      IntPoint(aTag->offsetLeft(), aTag->offsetTop()),
-      IntPoint(aTag->offsetLeft(), aTag->offsetTop()),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveOverLinkEvent(
+      WebInputEvent::MouseMove,
+      WebFloatPoint(aTag->offsetLeft(), aTag->offsetTop()),
+      WebFloatPoint(aTag->offsetLeft(), aTag->offsetTop()),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveOverLinkEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveOverLinkEvent, Vector<PlatformMouseEvent>());
+      mouseMoveOverLinkEvent, Vector<WebMouseEvent>());
 
   EXPECT_EQ(
       Cursor::Type::Hand,
       document->frame()->chromeClient().lastSetCursorForTesting().getType());
 
   // Mouse over enabled overlay scrollbar. Mouse cursor should be pointer and no
   // active hover element.
-  PlatformMouseEvent mouseMoveEvent(
-      IntPoint(18, aTag->offsetTop()), IntPoint(18, aTag->offsetTop()),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveEvent(
+      WebInputEvent::MouseMove, WebFloatPoint(18, aTag->offsetTop()),
+      WebFloatPoint(18, aTag->offsetTop()),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveEvent, Vector<PlatformMouseEvent>());
+      mouseMoveEvent, Vector<WebMouseEvent>());
 
   EXPECT_EQ(
       Cursor::Type::Pointer,
       document->frame()->chromeClient().lastSetCursorForTesting().getType());
 
-  PlatformMouseEvent mousePressEvent(
-      IntPoint(18, aTag->offsetTop()), IntPoint(18, aTag->offsetTop()),
-      WebPointerProperties::Button::Left, PlatformEvent::MousePressed, 0,
-      PlatformEvent::Modifiers::LeftButtonDown, TimeTicks::Now());
+  WebMouseEvent mousePressEvent(
+      WebInputEvent::MouseDown, WebFloatPoint(18, aTag->offsetTop()),
+      WebFloatPoint(18, aTag->offsetTop()), WebPointerProperties::Button::Left,
+      0, WebInputEvent::Modifiers::LeftButtonDown,
+      TimeTicks::Now().InSeconds());
+  mousePressEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMousePressEvent(mousePressEvent);
 
   EXPECT_FALSE(document->activeHoverElement());
   EXPECT_FALSE(document->hoverNode());
 
-  PlatformMouseEvent MouseReleaseEvent(
-      IntPoint(18, aTag->offsetTop()), IntPoint(18, aTag->offsetTop()),
-      WebPointerProperties::Button::Left, PlatformEvent::MouseReleased, 0,
-      PlatformEvent::Modifiers::LeftButtonDown, TimeTicks::Now());
-  document->frame()->eventHandler().handleMouseReleaseEvent(MouseReleaseEvent);
+  WebMouseEvent mouseReleaseEvent(
+      WebInputEvent::MouseUp, WebFloatPoint(18, aTag->offsetTop()),
+      WebFloatPoint(18, aTag->offsetTop()), WebPointerProperties::Button::Left,
+      0, WebInputEvent::Modifiers::LeftButtonDown,
+      TimeTicks::Now().InSeconds());
+  mouseReleaseEvent.setFrameScale(1);
+  document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent);
 
   // Mouse over disabled overlay scrollbar. Mouse cursor should be hand and has
   // active hover element.
   webView->mainFrameImpl()->frameView()->setScrollbarsHidden(true);
 
   // Ensure hittest only has link
   hitTestResult = webView->coreHitTestResultAt(WebPoint(18, aTag->offsetTop()));
 
   EXPECT_TRUE(hitTestResult.URLElement());
   EXPECT_TRUE(hitTestResult.innerElement());
   EXPECT_FALSE(hitTestResult.scrollbar());
 
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveEvent, Vector<PlatformMouseEvent>());
+      mouseMoveEvent, Vector<WebMouseEvent>());
 
   EXPECT_EQ(
       Cursor::Type::Hand,
       document->frame()->chromeClient().lastSetCursorForTesting().getType());
 
   document->frame()->eventHandler().handleMousePressEvent(mousePressEvent);
 
   EXPECT_TRUE(document->activeHoverElement());
   EXPECT_TRUE(document->hoverNode());
 
-  document->frame()->eventHandler().handleMouseReleaseEvent(MouseReleaseEvent);
+  document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent);
 }
 
 // Makes sure that mouse hover over an custom scrollbar doesn't change the
 // activate elements.
 TEST_F(WebFrameTest, MouseOverCustomScrollbar) {
   registerMockedHttpURLLoad("custom-scrollbar-hover.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webView = webViewHelper.initializeAndLoad(
       m_baseURL + "custom-scrollbar-hover.html");
 
   webViewHelper.resize(WebSize(200, 200));
 
   webView->updateAllLifecyclePhases();
 
   Document* document = toLocalFrame(webView->page()->mainFrame())->document();
 
   Element* scrollbarDiv = document->getElementById("scrollbar");
   EXPECT_TRUE(scrollbarDiv);
 
   // Ensure hittest only has DIV
   HitTestResult hitTestResult = webView->coreHitTestResultAt(WebPoint(1, 1));
 
   EXPECT_TRUE(hitTestResult.innerElement());
   EXPECT_FALSE(hitTestResult.scrollbar());
 
   // Mouse over DIV
-  PlatformMouseEvent mouseMoveOverDiv(
-      IntPoint(1, 1), IntPoint(1, 1), WebPointerProperties::Button::NoButton,
-      PlatformEvent::MouseMoved, 0, PlatformEvent::NoModifiers,
-      TimeTicks::Now());
+  WebMouseEvent mouseMoveOverDiv(
+      WebInputEvent::MouseMove, WebFloatPoint(1, 1), WebFloatPoint(1, 1),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveOverDiv.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveOverDiv, Vector<PlatformMouseEvent>());
+      mouseMoveOverDiv, Vector<WebMouseEvent>());
 
   // DIV :hover
   EXPECT_EQ(document->hoverNode(), scrollbarDiv);
 
   // Ensure hittest has DIV and scrollbar
   hitTestResult = webView->coreHitTestResultAt(WebPoint(175, 1));
 
   EXPECT_TRUE(hitTestResult.innerElement());
   EXPECT_TRUE(hitTestResult.scrollbar());
   EXPECT_TRUE(hitTestResult.scrollbar()->isCustomScrollbar());
 
   // Mouse over scrollbar
-  PlatformMouseEvent mouseMoveOverDivAndScrollbar(
-      IntPoint(175, 1), IntPoint(175, 1),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveOverDivAndScrollbar(
+      WebInputEvent::MouseMove, WebFloatPoint(175, 1), WebFloatPoint(175, 1),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveOverDivAndScrollbar.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveOverDivAndScrollbar, Vector<PlatformMouseEvent>());
+      mouseMoveOverDivAndScrollbar, Vector<WebMouseEvent>());
 
   // Custom not change the DIV :hover
   EXPECT_EQ(document->hoverNode(), scrollbarDiv);
   EXPECT_EQ(hitTestResult.scrollbar()->hoveredPart(), ScrollbarPart::ThumbPart);
 }
 
 TEST_F(WebFrameTest, MouseReleaseUpdatesScrollbarHoveredPart) {
   registerMockedHttpURLLoad("custom-scrollbar-hover.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webView = webViewHelper.initializeAndLoad(
@@ skipping 10 matching lines @@
 
   ScrollableArea* scrollableArea =
       toLayoutBox(scrollbarDiv->layoutObject())->getScrollableArea();
 
   EXPECT_TRUE(scrollableArea->verticalScrollbar());
   Scrollbar* scrollbar = scrollableArea->verticalScrollbar();
   EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::NoPart);
   EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::NoPart);
 
   // Mouse moved over the scrollbar.
-  PlatformMouseEvent mouseMoveOverScrollbar(
-      IntPoint(175, 1), IntPoint(175, 1),
-      WebPointerProperties::Button::NoButton, PlatformEvent::MouseMoved, 0,
-      PlatformEvent::NoModifiers, TimeTicks::Now());
+  WebMouseEvent mouseMoveOverScrollbar(
+      WebInputEvent::MouseMove, WebFloatPoint(175, 1), WebFloatPoint(175, 1),
+      WebPointerProperties::Button::NoButton, 0, WebInputEvent::NoModifiers,
+      TimeTicks::Now().InSeconds());
+  mouseMoveOverScrollbar.setFrameScale(1);
   document->frame()->eventHandler().handleMouseMoveEvent(
-      mouseMoveOverScrollbar, Vector<PlatformMouseEvent>());
+      mouseMoveOverScrollbar, Vector<WebMouseEvent>());
   HitTestResult hitTestResult = webView->coreHitTestResultAt(WebPoint(175, 1));
   EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::NoPart);
   EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::ThumbPart);
 
   // Mouse pressed.
-  PlatformMouseEvent mousePressEvent(
-      IntPoint(175, 1), IntPoint(175, 1), WebPointerProperties::Button::Left,
-      PlatformEvent::MousePressed, 0, PlatformEvent::Modifiers::LeftButtonDown,
-      TimeTicks::Now());
+  WebMouseEvent mousePressEvent(
+      WebInputEvent::MouseDown, WebFloatPoint(175, 1), WebFloatPoint(175, 1),
+      WebPointerProperties::Button::Left, 0,
+      WebInputEvent::Modifiers::LeftButtonDown, TimeTicks::Now().InSeconds());
+  mousePressEvent.setFrameScale(1);
   document->frame()->eventHandler().handleMousePressEvent(mousePressEvent);
   EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::ThumbPart);
   EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::ThumbPart);
 
   // Mouse moved off the scrollbar while still pressed.
-  PlatformMouseEvent mouseMoveOffScrollbar(
-      IntPoint(1, 1), IntPoint(1, 1), WebPointerProperties::Button::Left,
-      PlatformEvent::MouseMoved, 0, PlatformEvent::Modifiers::LeftButtonDown,
-      TimeTicks::Now());
+  WebMouseEvent mouseMoveOffScrollbar(
+      WebInputEvent::MouseMove, WebFloatPoint(1, 1), WebFloatPoint(1, 1),
+      WebPointerProperties::Button::Left, 0,
+      WebInputEvent::Modifiers::LeftButtonDown, TimeTicks::Now().InSeconds());
+  mouseMoveOffScrollbar.setFrameScale(1);
   document->frame()->eventHandler().handleMouseLeaveEvent(
       mouseMoveOffScrollbar);
   EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::ThumbPart);
   EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::ThumbPart);
 
   // Mouse released.
-  PlatformMouseEvent MouseReleaseEvent(
-      IntPoint(1, 1), IntPoint(1, 1), WebPointerProperties::Button::Left,
-      PlatformEvent::MouseReleased, 0, PlatformEvent::Modifiers::LeftButtonDown,
-      TimeTicks::Now());
-  document->frame()->eventHandler().handleMouseReleaseEvent(MouseReleaseEvent);
+  WebMouseEvent mouseReleaseEvent(
+      WebInputEvent::MouseUp, WebFloatPoint(1, 1), WebFloatPoint(1, 1),
+      WebPointerProperties::Button::Left, 0,
+      WebInputEvent::Modifiers::LeftButtonDown, TimeTicks::Now().InSeconds());
+  mouseReleaseEvent.setFrameScale(1);
+  document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent);
   EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::NoPart);
   EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::NoPart);
 }
 
 static void disableCompositing(WebSettings* settings) {
   settings->setAcceleratedCompositingEnabled(false);
   settings->setPreferCompositingToLCDTextEnabled(false);
 }
 
 // Make sure overlay scrollbars on non-composited scrollers fade out and set
@@ skipping 186 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink