Viewport resize anchoring should use the current layout viewport.

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
index cf47dc68ac6357b3affa54b9c037503cf2bde662..3b5e28597d048ac0a43e3ad3b345ed1f60bd1354 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -1861,4 +1861,44 @@ TEST_P(ParameterizedVisualViewportTest, ResizeWithScrollAnchoring)
     RuntimeEnabledFeatures::setScrollAnchoringEnabled(wasScrollAnchoringEnabled);
 }
 
+// Ensure that resize anchoring as happens when top controls hide/show affects
+// the scrollable area that's currently set as the root scroller.
+TEST_P(ParameterizedVisualViewportTest, ResizeAnchoringWithRootScroller)
+{
+    bool wasRootScrollerEnabled =
+        RuntimeEnabledFeatures::setRootScrollerEnabled();
+    RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
+
+    initializeWithAndroidSettings();
+    webViewImpl()->resize(IntSize(800, 600));
+
+    registerMockedHttpURLLoad("root-scroller-div.html");
+    navigateTo(m_baseURL + "root-scroller-div.html");
+
+    FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
+
+    Element* scroller = frame()->document()->getElementById("rootScroller");
+    NonThrowableExceptionState nonThrow;
+    frame()->document()->setRootScroller(scroller, nonThrow);
+
+    frameView.layoutViewportScrollableArea()->setScrollPosition(
+        DoublePoint(100, 200), ProgrammaticScroll);
+
+    webViewImpl()->setPageScaleFactor(3.f);
+    frameView.getScrollableArea()->setScrollPosition(
+        DoublePoint(0, 400), ProgrammaticScroll);
+
+    VisualViewport& visualViewport =
+        webViewImpl()->page()->frameHost().visualViewport();
+    visualViewport.setScrollPosition(DoublePoint(0, 400), ProgrammaticScroll);
+
+    webViewImpl()->resize(IntSize(800, 500));
+
+    EXPECT_POINT_EQ(
+        DoublePoint(100, 200),
+        frameView.layoutViewportScrollableArea()->scrollPositionDouble());
+
+    RuntimeEnabledFeatures::setSetRootScrollerEnabled(wasRootScrollerEnabled);
+}
+
 } // namespace