RootLayerScrolling: Fix RootScrollerTest.

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/dom/ClientRect.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 506 matching lines @@
   Element* container = iframe->contentDocument()->getElementById("container");
 
   const TopDocumentRootScrollerController& mainController =
       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(),
-              mainFrameView()->layerForScrolling());
+    EXPECT_EQ(
+        mainController.rootScrollerLayer(),
+        mainFrameView()->layoutViewportScrollableArea()->layerForScrolling());
     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);
     mainFrameView()->updateAllLifecyclePhases();
 
-    EXPECT_EQ(mainController.rootScrollerLayer(),
-              mainFrameView()->layerForScrolling());
+    EXPECT_EQ(
+        mainController.rootScrollerLayer(),
+        mainFrameView()->layoutViewportScrollableArea()->layerForScrolling());
     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);
     mainFrameView()->updateAllLifecyclePhases();
@@ skipping 10 matching lines @@
         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);
     mainFrameView()->updateAllLifecyclePhases();
     EXPECT_EQ(mainController.rootScrollerLayer(),
-              iframe->contentDocument()->view()->layerForScrolling());
+              iframe->contentDocument()
+                  ->view()
+                  ->layoutViewportScrollableArea()
+                  ->layerForScrolling());
     EXPECT_FALSE(
         mainController.isViewportScrollCallback(container->getApplyScroll()));
     EXPECT_FALSE(mainController.isViewportScrollCallback(
         mainFrame()->document()->documentElement()->getApplyScroll()));
     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);
     mainFrameView()->updateAllLifecyclePhases();
-    EXPECT_EQ(mainController.rootScrollerLayer(),
-              mainFrameView()->layerForScrolling());
+    EXPECT_EQ(
+        mainController.rootScrollerLayer(),
+        mainFrameView()->layoutViewportScrollableArea()->layerForScrolling());
     EXPECT_TRUE(mainController.isViewportScrollCallback(
         mainFrame()->document()->documentElement()->getApplyScroll()));
     EXPECT_FALSE(
         mainController.isViewportScrollCallback(container->getApplyScroll()));
     EXPECT_FALSE(mainController.isViewportScrollCallback(
         iframe->contentDocument()->documentElement()->getApplyScroll()));
   }
 }
 
 TEST_F(RootScrollerTest, TestSetRootScrollerCausesViewportLayerChange) {
@@ skipping 125 matching lines @@
     // ViewportScrollCallback removed.  Keep the scrolls to guard crashes
     // but the expectations on when a ViewportScrollCallback have changed
     // and should be updated.
     // EXPECT_EQ(200, container->scrollTop());
   }
 
   // Reset explicitly to prevent lifetime issues with the RemoteFrameClient.
   m_helper.reset();
 }
 
+GraphicsLayer* scrollingLayer(LayoutView& layoutView) {
+  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+    return layoutView.layer()->compositedLayerMapping()->scrollingLayer();
+  return layoutView.compositor()->rootContentLayer();
+}
+
 // Tests that clipping layers belonging to any compositors in the ancestor chain
 // of the global root scroller have their masking bit removed.
 TEST_F(RootScrollerTest, RemoveClippingOnCompositorLayers) {
   initialize("root-scroller-iframe.html");
 
   HTMLFrameOwnerElement* iframe = toHTMLFrameOwnerElement(
       mainFrame()->document()->getElementById("iframe"));
   Element* container = iframe->contentDocument()->getElementById("container");
 
   RootScrollerController& mainController =
       mainFrame()->document()->rootScrollerController();
   RootScrollerController& childController =
       iframe->contentDocument()->rootScrollerController();
   TopDocumentRootScrollerController& globalController =
       frameHost().globalRootScrollerController();
 
-  PaintLayerCompositor* mainCompositor =
-      mainFrameView()->layoutViewItem().compositor();
-  PaintLayerCompositor* childCompositor =
-      iframe->contentDocument()->view()->layoutViewItem().compositor();
+  LayoutView* mainLayoutView = mainFrameView()->layoutView();
+  LayoutView* childLayoutView = iframe->contentDocument()->layoutView();
+  PaintLayerCompositor* mainCompositor = mainLayoutView->compositor();
+  PaintLayerCompositor* childCompositor = childLayoutView->compositor();
 
   NonThrowableExceptionState nonThrow;
 
   // No root scroller set, on the main frame the root content layer should
   // clip. Additionally, on the child frame, the overflow controls host and
   // container layers should also clip.
   {
     EXPECT_TRUE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_TRUE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_TRUE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_TRUE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 
   // Now set the root scrollers such that the container in the iframe is the
   // global root scroller. All the previously clipping layers in both paint
   // layer compositors should no longer clip.
   {
     iframe->contentDocument()->setRootScroller(container, nonThrow);
     mainFrame()->document()->setRootScroller(iframe, nonThrow);
     mainFrameView()->updateAllLifecyclePhases();
 
     ASSERT_EQ(iframe, &mainController.effectiveRootScroller());
     ASSERT_EQ(container, &childController.effectiveRootScroller());
 
     EXPECT_FALSE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_FALSE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 
   // Now reset the iframe's root scroller. Since the iframe itself is now the
   // global root scroller we want it to behave as if it were the main frame,
   // which means it should clip only on its root content layer.
   {
     iframe->contentDocument()->setRootScroller(nullptr, nonThrow);
     mainFrameView()->updateAllLifecyclePhases();
 
     ASSERT_EQ(iframe, &mainController.effectiveRootScroller());
     ASSERT_EQ(iframe->contentDocument(),
               &childController.effectiveRootScroller());
     ASSERT_EQ(iframe->contentDocument()->documentElement(),
               globalController.globalRootScroller());
 
     EXPECT_FALSE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_TRUE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 
   // Now reset the main frame's root scroller. Its compositor should go back
   // to clipping as well. Because the iframe is now no longer the global root
   // scroller, it should go back to clipping its overflow host and container
   // layers. This checks that we invalidate the compositing state even though
   // the iframe's effective root scroller hasn't changed.
 
   {
     mainFrame()->document()->setRootScroller(nullptr, nonThrow);
     mainFrameView()->updateAllLifecyclePhases();
 
     ASSERT_EQ(mainFrame()->document(), &mainController.effectiveRootScroller());
     ASSERT_EQ(iframe->contentDocument(),
               &childController.effectiveRootScroller());
     ASSERT_EQ(mainFrame()->document()->documentElement(),
               globalController.globalRootScroller());
 
     EXPECT_TRUE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_TRUE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_TRUE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_TRUE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 
   // Set the iframe back as the main frame's root scroller. Since its the
   // global root scroller again, it should clip like the root frame. This
   // checks that we invalidate the compositing state even though the iframe's
   // effective root scroller hasn't changed.
   {
     mainFrame()->document()->setRootScroller(iframe, nonThrow);
     mainFrameView()->updateAllLifecyclePhases();
 
     ASSERT_EQ(iframe, &mainController.effectiveRootScroller());
     ASSERT_EQ(iframe->contentDocument(),
               &childController.effectiveRootScroller());
     ASSERT_EQ(iframe->contentDocument()->documentElement(),
               globalController.globalRootScroller());
 
     EXPECT_FALSE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_TRUE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 
   // Set just the iframe's root scroller. We should stop clipping the
   // iframe's compositor's layers but not the main frame's.
   {
     mainFrame()->document()->setRootScroller(nullptr, nonThrow);
     iframe->contentDocument()->setRootScroller(container, nonThrow);
     mainFrameView()->updateAllLifecyclePhases();
 
     ASSERT_EQ(mainFrame()->document(), &mainController.effectiveRootScroller());
     ASSERT_EQ(container, &childController.effectiveRootScroller());
 
     EXPECT_TRUE(
-        mainCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*mainLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         mainCompositor->containerLayer()->platformLayer()->masksToBounds());
 
     EXPECT_FALSE(
-        childCompositor->rootContentLayer()->platformLayer()->masksToBounds());
+        scrollingLayer(*childLayoutView)->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->rootGraphicsLayer()->platformLayer()->masksToBounds());
     EXPECT_FALSE(
         childCompositor->containerLayer()->platformLayer()->masksToBounds());
   }
 }
 
 // Tests that the clipping layer is resized on the root scroller element even
 // if the layout height doesn't change.
 TEST_F(RootScrollerTest, BrowserControlsResizeClippingLayer) {
@@ skipping 316 matching lines @@
   // FrameView without a layout.
   iframe->remove();
 
   EXPECT_EQ(mainFrameView()->layoutViewportScrollableArea(),
             &mainFrameView()->getRootFrameViewport()->layoutViewport());
 }
 
 }  // namespace
 
 }  // namespace blink