Removed main-thread one dimensional scrolling paths.

third_party/WebKit/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 "core/frame/RootFrameViewport.h"
 
 #include "core/layout/ScrollAlignment.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/scroll/ScrollableArea.h"
@@ skipping 188 matching lines @@
     // Disable just the layout viewport's horizontal scrolling, the
     // RootFrameViewport should remain scrollable overall.
     layoutViewport->setUserInputScrollable(false, true);
     visualViewport->setUserInputScrollable(true, true);
 
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
 
     // Layout viewport shouldn't scroll since it's not horizontally scrollable,
     // but visual viewport should.
-    rootFrameViewport->userScroll(ScrollRight, ScrollByPixel, 300);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(300, 0));
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(50, 0), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(50, 0), rootFrameViewport->scrollPositionDouble());
 
-    // Disable just the visual viewport's horizontal scrolling, only the layout
-    // viewport should scroll.
-    rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
-    layoutViewport->setUserInputScrollable(true, true);
-    visualViewport->setUserInputScrollable(false, true);
-
-    rootFrameViewport->userScroll(ScrollRight, ScrollByPixel, 300);
-    EXPECT_POINT_EQ(DoublePoint(100, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(100, 0), rootFrameViewport->scrollPositionDouble());
-
-    // Disable both viewports' horizontal scrolling, all horizontal scrolling
-    // should now be blocked.
-    rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
-    layoutViewport->setUserInputScrollable(false, true);
-    visualViewport->setUserInputScrollable(false, true);
-
-    rootFrameViewport->userScroll(ScrollRight, ScrollByPixel, 300);
-    EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), rootFrameViewport->scrollPositionDouble());
-
-    EXPECT_FALSE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
-    EXPECT_TRUE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
-
     // Vertical scrolling should be unaffected.
-    rootFrameViewport->userScroll(ScrollDown, ScrollByPixel, 300);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(0, 300));
     EXPECT_POINT_EQ(DoublePoint(0, 150), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 75), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 225), rootFrameViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(50, 75), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(50, 225), rootFrameViewport->scrollPositionDouble());
 
     // Try the same checks as above but for the vertical direction.
     // ===============================================
 
     rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
 
     // Disable just the layout viewport's vertical scrolling, the
     // RootFrameViewport should remain scrollable overall.
     layoutViewport->setUserInputScrollable(true, false);
     visualViewport->setUserInputScrollable(true, true);
 
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
 
     // Layout viewport shouldn't scroll since it's not vertically scrollable,
     // but visual viewport should.
-    rootFrameViewport->userScroll(ScrollDown, ScrollByPixel, 300);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(0, 300));
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 75), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 75), rootFrameViewport->scrollPositionDouble());
 
-    // Disable just the visual viewport's vertical scrolling, only the layout
-    // viewport should scroll.
-    rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
-    layoutViewport->setUserInputScrollable(true, true);
-    visualViewport->setUserInputScrollable(true, false);
-
-    rootFrameViewport->userScroll(ScrollDown, ScrollByPixel, 300);
-    EXPECT_POINT_EQ(DoublePoint(0, 150), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 150), rootFrameViewport->scrollPositionDouble());
-
-    // Disable both viewports' horizontal scrolling, all vertical scrolling
-    // should now be blocked.
-    rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
-    layoutViewport->setUserInputScrollable(true, false);
-    visualViewport->setUserInputScrollable(true, false);
-
-    rootFrameViewport->userScroll(ScrollDown, ScrollByPixel, 300);
-    EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), rootFrameViewport->scrollPositionDouble());
-
-    EXPECT_TRUE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
-    EXPECT_FALSE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
-
     // Horizontal scrolling should be unaffected.
-    rootFrameViewport->userScroll(ScrollRight, ScrollByPixel, 300);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(300, 0));
     EXPECT_POINT_EQ(DoublePoint(100, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(50, 0), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(150, 0), rootFrameViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(50, 75), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(150, 75), rootFrameViewport->scrollPositionDouble());
 }
 
 // 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 userScroll()
     visualViewport->setScrollPosition(DoublePoint(50, 75), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 75), rootFrameViewport->scrollPositionDouble());
 
-    rootFrameViewport->userScroll(ScrollLeft, ScrollByPixel, 50);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(-50, 0));
     EXPECT_POINT_EQ(DoublePoint(0, 75), rootFrameViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 75), 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);
+    rootFrameViewport->userScroll(ScrollByPixel, FloatSize(-100, 0));
     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.
 TEST_F(RootFrameViewportTest, ScrollIntoView)
 {
     IntSize viewportSize(100, 150);
     OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
@@ skipping 142 matching lines @@
     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