Remove PlatformGestureEvent in favour of using WebGestureEvent

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@gmail.com>
@@ skipping 57 matching lines @@
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/RootScrollerController.h"
 #include "core/page/scrolling/RootScrollerUtil.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/PaintLayerFragment.h"
-#include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
@@ skipping 1411 matching lines @@
   // the case?
   IntSize elementSize = layer()->size();
   if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
     elementSize.setWidth(0);
   IntPoint resizerPoint = IntPoint(elementSize);
   IntPoint localPoint =
       roundedIntPoint(box().absoluteToLocal(absolutePoint, UseTransforms));
   return localPoint - resizerPoint;
 }
 
+void PaintLayerScrollableArea::resize(const WebGestureEvent& evt,

[majidvp, 2016/12/01 15:46:30]

Feels like the two resize method here don't really belong in 
|PaintLayerScrollableArea| and can be factored out to helper
functions elsewhere.

[dtapuska, 2016/12/01 16:26:43]

Yes I agree. There are only two calls into resize; and the point translation
could actually be done in the call sites instead of this class.

+                                      const LayoutSize& oldOffset) {
+  if (evt.type == WebInputEvent::GestureScrollUpdate) {
+    IntPoint pos = roundedIntPoint(evt.positionInRootFrame());
+    pos.move(evt.deltaXInRootFrame(), evt.deltaYInRootFrame());
+    resize(pos, oldOffset);
+  } else {
+    NOTREACHED();
+  }
+}
+
 void PaintLayerScrollableArea::resize(const PlatformEvent& evt,
                                       const LayoutSize& oldOffset) {
+  if (evt.type() == PlatformEvent::MouseMoved) {
+    const PlatformMouseEvent* mouseMove =
+        static_cast<const PlatformMouseEvent*>(&evt);
+    if ((mouseMove->getModifiers() &
+         (PlatformEvent::LeftButtonDown | PlatformEvent::MiddleButtonDown |
+          PlatformEvent::RightButtonDown)) == 0)
+      return;
+    resize(mouseMove->position(), oldOffset);
+  } else {
+    NOTREACHED();
+  }
+}
+
+void PaintLayerScrollableArea::resize(const IntPoint& pos,
+                                      const LayoutSize& oldOffset) {
   // FIXME: This should be possible on generated content but is not right now.
   if (!inResizeMode() || !box().canResize() || !box().node())
     return;
 
   DCHECK(box().node()->isElementNode());
   Element* element = toElement(box().node());
 
   Document& document = element->document();
 
-  IntPoint pos;
-  const PlatformGestureEvent* gevt = 0;
-
-  switch (evt.type()) {
-    case PlatformEvent::MouseMoved:
-      if (!document.frame()->eventHandler().mousePressed())
-        return;
-      pos = static_cast<const PlatformMouseEvent*>(&evt)->position();
-      break;
-    case PlatformEvent::GestureScrollUpdate:
-      pos = static_cast<const PlatformGestureEvent*>(&evt)->position();
-      gevt = static_cast<const PlatformGestureEvent*>(&evt);
-      pos = gevt->position();
-      pos.move(gevt->deltaX(), gevt->deltaY());
-      break;
-    default:
-      ASSERT_NOT_REACHED();
-  }
-
   float zoomFactor = box().style()->effectiveZoom();
 
   IntSize newOffset =
       offsetFromResizeCorner(document.view()->rootFrameToContents(pos));
   newOffset.setWidth(newOffset.width() / zoomFactor);
   newOffset.setHeight(newOffset.height() / zoomFactor);
 
   LayoutSize currentSize = box().size();
   currentSize.scale(1 / zoomFactor);
   LayoutSize minimumSize =
@@ skipping 466 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
     clampScrollableAreas() {
   for (auto& scrollableArea : *s_needsClamp)
     scrollableArea->clampScrollOffsetAfterOverflowChange();
   delete s_needsClamp;
   s_needsClamp = nullptr;
 }
 
 }  // namespace blink