Move TopDocumentRootScrollerController to a separate object on FrameHost

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

 // Copyright 2016 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/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/TopControls.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/RootScrollerController.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/PaintLayerScrollableArea.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebConsoleMessage.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 482 matching lines @@
 TEST_F(RootScrollerTest, SetRootScrollerIframeUsesCorrectLayerAndCallback)
 {
     initialize("root-scroller-iframe.html");
     ASSERT_EQ(nullptr, mainFrame()->document()->rootScroller());
 
     HTMLFrameOwnerElement* iframe = toHTMLFrameOwnerElement(
         mainFrame()->document()->getElementById("iframe"));
     Element* container =
         iframe->contentDocument()->getElementById("container");
 
-    RootScrollerController* mainController =
-        mainFrame()->document()->rootScrollerController();
+    TopDocumentRootScrollerController& mainController =

[tdresser, 2016/08/30 15:05:30]

Can this be const?

[bokan, 2016/08/30 16:13:39]

Done.

+        mainFrame()->document()->frameHost()->globalRootScrollerController();
 
     NonThrowableExceptionState nonThrow;
 
     // No root scroller set, the documentElement should be the effective root
     // and the main FrameView's scroll layer should be the layer to use.
     {
         EXPECT_EQ(
-            mainController->rootScrollerLayer(),
+            mainController.rootScrollerLayer(),
             mainFrameView()->layerForScrolling());
-        EXPECT_TRUE(mainController->isViewportScrollCallback(
+        EXPECT_TRUE(mainController.isViewportScrollCallback(
             mainFrame()->document()->documentElement()->getApplyScroll()));
     }
 
     // Set a root scroller in the iframe. Since the main document didn't set a
     // root scroller, the global root scroller shouldn't change.
     {
 
         iframe->contentDocument()->setRootScroller(container, nonThrow);
 
         EXPECT_EQ(
-            mainController->rootScrollerLayer(),
+            mainController.rootScrollerLayer(),
             mainFrameView()->layerForScrolling());
-        EXPECT_TRUE(mainController->isViewportScrollCallback(
+        EXPECT_TRUE(mainController.isViewportScrollCallback(
             mainFrame()->document()->documentElement()->getApplyScroll()));
     }
 
     // Setting the iframe as the root scroller in the main frame should now
     // link the root scrollers so the container should now be the global root
     // scroller.
     {
         mainFrame()->document()->setRootScroller(iframe, nonThrow);
 
         ScrollableArea* containerScroller =
             static_cast<PaintInvalidationCapableScrollableArea*>(
                 toLayoutBox(container->layoutObject())->getScrollableArea());
 
         EXPECT_EQ(
-            mainController->rootScrollerLayer(),
+            mainController.rootScrollerLayer(),
             containerScroller->layerForScrolling());
-        EXPECT_FALSE(mainController->isViewportScrollCallback(
+        EXPECT_FALSE(mainController.isViewportScrollCallback(
             mainFrame()->document()->documentElement()->getApplyScroll()));
-        EXPECT_TRUE(mainController->isViewportScrollCallback(
+        EXPECT_TRUE(mainController.isViewportScrollCallback(
             container->getApplyScroll()));
     }
 
     // Unsetting the root scroller in the iframe should reset its effective
     // root scroller to the iframe's documentElement and thus the iframe's
     // documentElement becomes the global root scroller.
     {
         iframe->contentDocument()->setRootScroller(nullptr, nonThrow);
         EXPECT_EQ(
-            mainController->rootScrollerLayer(),
+            mainController.rootScrollerLayer(),
             iframe->contentDocument()->view()->layerForScrolling());
-        EXPECT_FALSE(mainController->isViewportScrollCallback(
+        EXPECT_FALSE(mainController.isViewportScrollCallback(
             container->getApplyScroll()));
-        EXPECT_FALSE(mainController->isViewportScrollCallback(
+        EXPECT_FALSE(mainController.isViewportScrollCallback(
             mainFrame()->document()->documentElement()->getApplyScroll()));
-        EXPECT_TRUE(mainController->isViewportScrollCallback(
+        EXPECT_TRUE(mainController.isViewportScrollCallback(
             iframe->contentDocument()->documentElement()->getApplyScroll()));
     }
 
     // Finally, unsetting the main frame's root scroller should reset it to the
     // documentElement and corresponding layer.
     {
         mainFrame()->document()->setRootScroller(nullptr, nonThrow);
         EXPECT_EQ(
-            mainController->rootScrollerLayer(),
+            mainController.rootScrollerLayer(),
             mainFrameView()->layerForScrolling());
-        EXPECT_TRUE(mainController->isViewportScrollCallback(
+        EXPECT_TRUE(mainController.isViewportScrollCallback(
             mainFrame()->document()->documentElement()->getApplyScroll()));
-        EXPECT_FALSE(mainController->isViewportScrollCallback(
+        EXPECT_FALSE(mainController.isViewportScrollCallback(
             container->getApplyScroll()));
-        EXPECT_FALSE(mainController->isViewportScrollCallback(
+        EXPECT_FALSE(mainController.isViewportScrollCallback(
             iframe->contentDocument()->documentElement()->getApplyScroll()));
     }
 }
 
 TEST_F(RootScrollerTest, TestSetRootScrollerCausesViewportLayerChange)
 {
     // TODO(bokan): Need a test that changing root scrollers actually sets the
     // outer viewport layer on the compositor, even in the absence of other
     // compositing changes. crbug.com/505516
 }
@@ skipping 30 matching lines @@
             body,
             exceptionState);
 
         EXPECT_EQ(body, iframe->contentDocument()->rootScroller());
     }
 }
 
 } // namespace
 
 } // namespace blink