Remove PlatformMouseEvent and use WebMouseEvent instead

third_party/WebKit/Source/platform/scroll/ScrollbarTheme.cpp

 /*
  * Copyright (C) 2011 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/scroll/ScrollbarTheme.h"
 
-#include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/CompositingRecorder.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeMock.h"
 #include "platform/scroll/ScrollbarThemeOverlayMock.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebMouseEvent.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebScrollbarBehavior.h"
 #include "wtf/Optional.h"
 
 #if !OS(MACOSX)
 #include "public/platform/WebThemeEngine.h"
 #endif
 
 namespace blink {
@@ skipping 160 matching lines @@
 #if OS(MACOSX)
   context.fillRect(cornerRect, Color::white);
 #else
   Platform::current()->themeEngine()->paint(
       context.canvas(), WebThemeEngine::PartScrollbarCorner,
       WebThemeEngine::StateNormal, WebRect(cornerRect), 0);
 #endif
 }
 
 bool ScrollbarTheme::shouldCenterOnThumb(const ScrollbarThemeClient& scrollbar,
-                                         const PlatformMouseEvent& evt) {
+                                         const WebMouseEvent& evt) {
   return Platform::current()->scrollbarBehavior()->shouldCenterOnThumb(
-      evt.pointerProperties().button, evt.shiftKey(), evt.altKey());
+      evt.button, evt.modifiers() & WebInputEvent::ShiftKey,
+      evt.modifiers() & WebInputEvent::AltKey);
 }
 
 void ScrollbarTheme::paintTickmarks(GraphicsContext& context,
                                     const Scrollbar& scrollbar,
                                     const IntRect& rect) {
 // Android paints tickmarks in the browser at FindResultBar.java.
 #if !OS(ANDROID)
   if (scrollbar.orientation() != VerticalScrollbar)
     return;
 
@@ skipping 28 matching lines @@
 
     FloatRect tickStroke(rect.x() + tickmarkBorderWidth(), yPos + 1,
                          rect.width() - 2 * tickmarkBorderWidth(), 1);
     context.fillRect(tickStroke, Color(0xFF, 0xDD, 0x00, 0xFF));
   }
 #endif
 }
 
 bool ScrollbarTheme::shouldSnapBackToDragOrigin(
     const ScrollbarThemeClient& scrollbar,
-    const PlatformMouseEvent& evt) {
-  IntPoint mousePosition = scrollbar.convertFromRootFrame(evt.position());
+    const WebMouseEvent& evt) {
+  IntPoint mousePosition = scrollbar.convertFromRootFrame(
+      flooredIntPoint(evt.positionInRootFrame()));
   mousePosition.move(scrollbar.x(), scrollbar.y());
   return Platform::current()->scrollbarBehavior()->shouldSnapBackToDragOrigin(
       mousePosition, trackRect(scrollbar),
       scrollbar.orientation() == HorizontalScrollbar);
 }
 
 double ScrollbarTheme::overlayScrollbarFadeOutDelaySeconds() const {
   // On Mac, fading is controlled by the painting code in ScrollAnimatorMac.
   return 0.0;
 }
@@ skipping 151 matching lines @@
       return DisplayItem::kScrollbarBackTrack;
     case ForwardTrackPart:
       return DisplayItem::kScrollbarForwardTrack;
     default:
       ASSERT_NOT_REACHED();
       return DisplayItem::kScrollbarBackTrack;
   }
 }
 
 }  // namespace blink