Remove special wheel handling path from ScrollableArea

Source/core/frame/RootFrameViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/RootFrameViewport.h"
 
 #include "core/layout/ScrollAlignment.h"
 #include "platform/geometry/DoubleRect.h"
@@ skipping 280 matching lines @@
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
     EXPECT_FALSE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
 
     // Horizontal scrolling should be unaffected.
     rootFrameViewport->userScroll(ScrollRight, ScrollByPixel, 300);
     EXPECT_POINT_EQ(DoublePoint(100, 0), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(50, 0), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(150, 0), rootFrameViewport->scrollPositionDouble());
 }
 
-// Make sure scrolls using the scroll animator (scroll(), setScrollPosition(), wheelHandler)
+// Make sure scrolls using the scroll animator (scroll(), setScrollPosition())
 // work correctly when one of the subviewports is explicitly scrolled without using the
 // RootFrameViewport interface.
 TEST_F(RootFrameViewportTest, TestScrollAnimatorUpdatedBeforeScroll)
 {
     IntSize viewportSize(100, 150);
     OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
     OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
     OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
     visualViewport->setScrollPosition(DoublePoint(50, 75), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 75), rootFrameViewport->scrollPositionDouble());
 
     // If the scroll animator doesn't update, it will still think it's at (0, 0) and so it
     // may early exit.
     rootFrameViewport->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(0, 0), rootFrameViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
 
-    // Try again for scroll()
+    // Try again for userScroll()
     visualViewport->setScrollPosition(DoublePoint(50, 75), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 75), rootFrameViewport->scrollPositionDouble());
 
     rootFrameViewport->userScroll(ScrollLeft, ScrollByPixel, 50);
     EXPECT_POINT_EQ(DoublePoint(0, 75), rootFrameViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 75), visualViewport->scrollPositionDouble());
 
-    // Try again for handleWheel.
-    visualViewport->setScrollPosition(DoublePoint(50, 75), ProgrammaticScroll);
-    EXPECT_POINT_EQ(DoublePoint(50, 75), rootFrameViewport->scrollPositionDouble());
-
-    PlatformWheelEvent wheelEvent(
-        IntPoint(10, 10), IntPoint(10, 10),
-        50, 75,
-        0, 0,
-        ScrollByPixelWheelEvent,
-        false, false, false, false);
-    rootFrameViewport->handleWheel(wheelEvent);
-    EXPECT_POINT_EQ(DoublePoint(0, 0), rootFrameViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
-
     // Make sure the layout viewport is also accounted for.
+    rootFrameViewport->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
     layoutViewport->setScrollPosition(DoublePoint(100, 150), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(100, 150), rootFrameViewport->scrollPositionDouble());
 
     rootFrameViewport->userScroll(ScrollLeft, ScrollByPixel, 100);
     EXPECT_POINT_EQ(DoublePoint(0, 150), rootFrameViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 150), layoutViewport->scrollPositionDouble());
 }
 
 // Test that the scrollIntoView correctly scrolls the main frame
 // and visual viewport such that the given rect is centered in the viewport.
@@ skipping 123 matching lines @@
     EXPECT_SIZE_EQ(DoubleSize(500, 401), rootFrameViewport->visibleContentRectDouble().size());
 
     visualViewport->setScale(2);
 
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRect().location());
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRectDouble().location());
     EXPECT_SIZE_EQ(DoubleSize(250, 201), rootFrameViewport->visibleContentRect().size());
     EXPECT_SIZE_EQ(DoubleSize(250, 200.5), rootFrameViewport->visibleContentRectDouble().size());
 }
 
-// Tests that wheel events are correctly handled in the non-root layer scrolls
-// path.
-TEST_F(RootFrameViewportTest, BasicWheelEvent)
-{
-    IntSize viewportSize(100, 100);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
-
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
-
-    visualViewport->setScale(2);
-
-    PlatformWheelEvent wheelEvent(
-        IntPoint(10, 10), IntPoint(10, 10),
-        -500, -500,
-        0, 0,
-        ScrollByPixelWheelEvent,
-        false, false, false, false);
-
-    ScrollResult result = rootFrameViewport->handleWheel(wheelEvent);
-
-    EXPECT_TRUE(result.didScroll());
-    EXPECT_POINT_EQ(DoublePoint(50, 50), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(100, 200), layoutViewport->scrollPositionDouble());
-    EXPECT_EQ(350, result.unusedScrollDeltaX);
-    EXPECT_EQ(250, result.unusedScrollDeltaY);
-}
-
 // Tests that the invert scroll order experiment scrolls the visual viewport
 // before trying to scroll the layout viewport.
 TEST_F(RootFrameViewportTest, ViewportScrollOrder)
 {
     IntSize viewportSize(100, 100);
     OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
     OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
     bool invertScrollOrder = true;
     OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport =
         RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get(), invertScrollOrder);
 
     visualViewport->setScale(2);
 
-    PlatformWheelEvent wheelEvent(
-        IntPoint(10, 10), IntPoint(10, 10),
-        -25, -25,
-        0, 0,
-        ScrollByPixelWheelEvent,
-        false, false, false, false);
-
-    ScrollResult result = rootFrameViewport->handleWheel(wheelEvent);
-
-    EXPECT_TRUE(result.didScroll());
-    EXPECT_POINT_EQ(DoublePoint(25, 25), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_EQ(0, result.unusedScrollDeltaX);
-    EXPECT_EQ(0, result.unusedScrollDeltaY);
-
     rootFrameViewport->setScrollPosition(DoublePoint(40, 40), UserScroll);
     EXPECT_POINT_EQ(DoublePoint(40, 40), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
 
     rootFrameViewport->setScrollPosition(DoublePoint(60, 60), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 50), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(10, 10), layoutViewport->scrollPositionDouble());
 }
 
 } // namespace blink