Remove PlatformGestureEvent in favour of using WebGestureEvent

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

 /*
  * Copyright (C) 2004, 2006, 2008 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 COMPUTER, 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 COMPUTER, 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/Scrollbar.h"
 
 #include <algorithm>
 #include "platform/HostWindow.h"
-#include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/scroll/ScrollbarTheme.h"
+#include "public/platform/WebGestureEvent.h"
 
 namespace blink {
 
 Scrollbar::Scrollbar(ScrollableArea* scrollableArea,
                      ScrollbarOrientation orientation,
                      ScrollbarControlSize controlSize,
                      HostWindow* hostWindow,
                      ScrollbarTheme* theme)
     : m_scrollableArea(scrollableArea),
       m_orientation(orientation),
@@ skipping 266 matching lines @@
 void Scrollbar::setPressedPart(ScrollbarPart part) {
   if (m_pressedPart != NoPart
       // When we no longer have a pressed part, we can start drawing a hovered
       // state on the hovered part.
       || m_hoveredPart != NoPart)
     setNeedsPaintInvalidation(
         static_cast<ScrollbarPart>(m_pressedPart | m_hoveredPart | part));
   m_pressedPart = part;
 }
 
-bool Scrollbar::gestureEvent(const PlatformGestureEvent& evt,
+bool Scrollbar::gestureEvent(const WebGestureEvent& evt,
                              bool* shouldUpdateCapture) {
   DCHECK(shouldUpdateCapture);
-  switch (evt.type()) {
-    case PlatformEvent::GestureTapDown:
-      setPressedPart(theme().hitTest(*this, evt.position()));
+  switch (evt.type) {
+    case WebInputEvent::GestureTapDown: {
+      IntPoint position = flooredIntPoint(evt.positionInRootFrame());
+      setPressedPart(theme().hitTest(*this, position));
       m_pressedPos = orientation() == HorizontalScrollbar
-                         ? convertFromRootFrame(evt.position()).x()
-                         : convertFromRootFrame(evt.position()).y();
+                         ? convertFromRootFrame(position).x()
+                         : convertFromRootFrame(position).y();
       *shouldUpdateCapture = true;
       return true;
-    case PlatformEvent::GestureTapDownCancel:
+    }
+    case WebInputEvent::GestureTapCancel:
       if (m_pressedPart != ThumbPart)
         return false;
       m_scrollPos = m_pressedPos;
       return true;
-    case PlatformEvent::GestureScrollBegin:
-      switch (evt.source()) {
-        case PlatformGestureSourceTouchpad:
+    case WebInputEvent::GestureScrollBegin:
+      switch (evt.sourceDevice) {
+        case WebGestureDeviceTouchpad:
           // Update the state on GSB for touchpad since GestureTapDown
           // is not generated by that device. Touchscreen uses the tap down
           // gesture since the scrollbar enters a visual active state.
           *shouldUpdateCapture = true;
           setPressedPart(NoPart);
           m_pressedPos = 0;
           return true;
-        case PlatformGestureSourceTouchscreen:
+        case WebGestureDeviceTouchscreen:
           if (m_pressedPart != ThumbPart)
             return false;
           m_scrollPos = m_pressedPos;
           return true;
         default:
           ASSERT_NOT_REACHED();
           return true;
       }
       break;
-    case PlatformEvent::GestureScrollUpdate:
-      switch (evt.source()) {
-        case PlatformGestureSourceTouchpad: {
-          FloatSize delta(-evt.deltaX(), -evt.deltaY());
+    case WebInputEvent::GestureScrollUpdate:
+      switch (evt.sourceDevice) {
+        case WebGestureDeviceTouchpad: {
+          FloatSize delta(-evt.deltaXInRootFrame(), -evt.deltaYInRootFrame());
           if (m_scrollableArea &&
-              m_scrollableArea->userScroll(evt.deltaUnits(), delta)
+              m_scrollableArea
+                  ->userScroll(toPlatformScrollGranularity(evt.deltaUnits()),
+                               delta)
                   .didScroll()) {
             return true;
           }
           return false;
         }
-        case PlatformGestureSourceTouchscreen:
+        case WebGestureDeviceTouchscreen:
           if (m_pressedPart != ThumbPart)
             return false;
-          m_scrollPos += orientation() == HorizontalScrollbar ? evt.deltaX()
-                                                              : evt.deltaY();
+          m_scrollPos += orientation() == HorizontalScrollbar
+                             ? evt.deltaXInRootFrame()
+                             : evt.deltaYInRootFrame();
           moveThumb(m_scrollPos, false);
           return true;
         default:
           ASSERT_NOT_REACHED();
           return true;
       }
       break;
-    case PlatformEvent::GestureScrollEnd:
-    case PlatformEvent::GestureLongPress:
-    case PlatformEvent::GestureFlingStart:
+    case WebInputEvent::GestureScrollEnd:
+    case WebInputEvent::GestureLongPress:
+    case WebInputEvent::GestureFlingStart:
       m_scrollPos = 0;
       m_pressedPos = 0;
       setPressedPart(NoPart);
       return false;
-    case PlatformEvent::GestureTap: {
+    case WebInputEvent::GestureTap: {
       if (m_pressedPart != ThumbPart && m_pressedPart != NoPart &&
           m_scrollableArea &&
           m_scrollableArea
               ->userScroll(
                   pressedPartScrollGranularity(),
                   toScrollDelta(pressedPartScrollDirectionPhysical(), 1))
               .didScroll()) {
         return true;
       }
       m_scrollPos = 0;
@@ skipping 223 matching lines @@
     invalidParts = AllParts;
   if (invalidParts & ~ThumbPart)
     m_trackNeedsRepaint = true;
   if (invalidParts & ThumbPart)
     m_thumbNeedsRepaint = true;
   if (m_scrollableArea)
     m_scrollableArea->setScrollbarNeedsPaintInvalidation(orientation());
 }
 
 }  // namespace blink