Revert of Remove invert viewport scroll order setting from Blink

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 "config.h"
 #include "core/frame/RootFrameViewport.h"
 
 #include "core/layout/ScrollAlignment.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/LayoutRect.h"
@@ skipping 342 matching lines @@
         LayoutRect(100, 250, 50, 50),
         ScrollAlignment::alignToEdgeIfNeeded,
         ScrollAlignment::alignToEdgeIfNeeded);
     EXPECT_POINT_EQ(DoublePoint(50, 150), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 50), visualViewport->scrollPositionDouble());
 
     rootFrameViewport->scrollIntoView(
         LayoutRect(25, 75, 50, 50),
         ScrollAlignment::alignToEdgeIfNeeded,
         ScrollAlignment::alignToEdgeIfNeeded);
-    EXPECT_POINT_EQ(DoublePoint(25, 75), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(25, 25), layoutViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(0, 50), visualViewport->scrollPositionDouble());
 
-    // Reset the visual viewport's size, scale the page, and repeat the test
+    // Reset the visual viewport's size, scale the page and repeat the test
     visualViewport->setViewportSize(IntSize(100, 150));
     visualViewport->setScale(2);
     rootFrameViewport->setScrollPosition(DoublePoint(), ProgrammaticScroll);
 
     rootFrameViewport->scrollIntoView(
         LayoutRect(50, 75, 50, 75),
         ScrollAlignment::alignToEdgeIfNeeded,
         ScrollAlignment::alignToEdgeIfNeeded);
-    EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(50, 75), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(50, 75), layoutViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
 
     rootFrameViewport->scrollIntoView(
         LayoutRect(190, 290, 10, 10),
         ScrollAlignment::alignToEdgeIfNeeded,
         ScrollAlignment::alignToEdgeIfNeeded);
     EXPECT_POINT_EQ(DoublePoint(100, 150), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(50, 75), visualViewport->scrollPositionDouble());
 
     // Scrolling into view the viewport rect itself should be a no-op.
     visualViewport->setViewportSize(IntSize(100, 100));
@@ skipping 28 matching lines @@
 TEST_F(RootFrameViewportTest, SetScrollPosition)
 {
     IntSize viewportSize(500, 500);
     OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(1000, 2000));
     OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
     OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
-    // Ensure that the visual viewport scrolls first.
+    // Ensure that the layout viewport scrolls first.
     rootFrameViewport->setScrollPosition(DoublePoint(100, 100), ProgrammaticScroll);
-    EXPECT_POINT_EQ(DoublePoint(100, 100), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(100, 100), layoutViewport->scrollPositionDouble());
 
-    // Scroll to the visual viewport's extent, the layout viewport should scroll the
+    // Scroll to the layout viewport's extent, the visual viewport should scroll the
     // remainder.
-    rootFrameViewport->setScrollPosition(DoublePoint(300, 400), ProgrammaticScroll);
-    EXPECT_POINT_EQ(DoublePoint(250, 250), visualViewport->scrollPositionDouble());
-    EXPECT_POINT_EQ(DoublePoint(50, 150), layoutViewport->scrollPositionDouble());
+    rootFrameViewport->setScrollPosition(DoublePoint(700, 1700), ProgrammaticScroll);
+    EXPECT_POINT_EQ(DoublePoint(200, 200), visualViewport->scrollPositionDouble());
+    EXPECT_POINT_EQ(DoublePoint(500, 1500), layoutViewport->scrollPositionDouble());
 
-    // Only the layout viewport should scroll further. Make sure it doesn't scroll
+    // Only the visual viewport should scroll further. Make sure it doesn't scroll
     // out of bounds.
     rootFrameViewport->setScrollPosition(DoublePoint(780, 1780), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(250, 250), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(500, 1500), layoutViewport->scrollPositionDouble());
 
     // Scroll all the way back.
     rootFrameViewport->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
 }
@@ skipping 16 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 scrolls on the root frame scroll the visual viewport before
-// trying to scroll the layout viewport.
+// 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());
+        RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get(), invertScrollOrder);
 
     visualViewport->setScale(2);
 
     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