Make RootScroller set the outer viewport scroll layer in the compositor

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 70 matching lines @@
 #include "core/page/DragController.h"
 #include "core/page/DragData.h"
 #include "core/page/DragSession.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/TouchDisambiguation.h"
+#include "core/page/scrolling/RootScrollerController.h"
 #include "core/paint/PaintLayer.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/credentialmanager/CredentialManagerClient.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/ContextMenu.h"
@@ skipping 4083 matching lines @@
 }
 
 bool WebViewImpl::tabsToLinks() const
 {
     return m_tabsToLinks;
 }
 
 void WebViewImpl::registerViewportLayersWithCompositor()
 {
     DCHECK(m_layerTreeView);
-    DCHECK(!page()->deprecatedLocalMainFrame()->contentLayoutItem().isNull());
+    DCHECK(page()->deprecatedLocalMainFrame());
 
-    PaintLayerCompositor* compositor =
-        page()->deprecatedLocalMainFrame()->contentLayoutItem().compositor();
+    Document* document = page()->deprecatedLocalMainFrame()->document();
 
-    DCHECK(compositor);
+    DCHECK(document);
 
     // Get the outer viewport scroll layer.
-    WebLayer* scrollLayer =
-        compositor->scrollLayer()
-            ? compositor->scrollLayer()->platformLayer()
-            : nullptr;
+    GraphicsLayer* layoutViewportScrollLayer =
+        document->rootScrollerController()->rootScrollerLayer();
+    WebLayer* layoutViewportWebLayer = layoutViewportScrollLayer
+        ? layoutViewportScrollLayer->platformLayer()
+        : nullptr;
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
 
     // TODO(bokan): This was moved here from when registerViewportLayers was a
     // part of VisualViewport and maybe doesn't belong here. See comment inside
     // the mehtod.
-    visualViewport.setScrollLayerOnScrollbars(scrollLayer);
+    visualViewport.setScrollLayerOnScrollbars(layoutViewportWebLayer);
 
     m_layerTreeView->registerViewportLayers(
         visualViewport.overscrollElasticityLayer()->platformLayer(),
         visualViewport.pageScaleLayer()->platformLayer(),
         visualViewport.scrollLayer()->platformLayer(),
-        scrollLayer);
+        layoutViewportWebLayer);
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     if (!m_layerTreeView)
         return;
 
     // In SPv2, we attach layers via PaintArtifactCompositor, rather than
     // supplying a root GraphicsLayer from PaintLayerCompositor.
     DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
@@ skipping 340 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink