Moved viewport layer registration into WebViewImpl.

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 4164 matching lines @@
 void WebViewImpl::setTabsToLinks(bool enable)
 {
     m_tabsToLinks = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const
 {
     return m_tabsToLinks;
 }
 
+void WebViewImpl::registerViewportLayersWithCompositor()
+{
+    DCHECK(m_layerTreeView);
+    DCHECK(!page()->deprecatedLocalMainFrame()->contentLayoutItem().isNull());
+
+    PaintLayerCompositor* compositor =
+        page()->deprecatedLocalMainFrame()->contentLayoutItem().compositor();
+
+    DCHECK(compositor);
+
+    // Get the outer viewport scroll layer.
+    WebLayer* scrollLayer =
+        compositor->scrollLayer()
+            ? compositor->scrollLayer()->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);
+
+    m_layerTreeView->registerViewportLayers(
+        visualViewport.overscrollElasticityLayer()->platformLayer(),
+        visualViewport.pageScaleLayer()->platformLayer(),
+        visualViewport.scrollLayer()->platformLayer(),
+        scrollLayer);
+}
+
 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());
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
     visualViewport.attachToLayerTree(layer);
     if (layer) {
         m_rootGraphicsLayer = visualViewport.rootGraphicsLayer();
         m_visualViewportContainerLayer = visualViewport.containerLayer();
         m_rootLayer = m_rootGraphicsLayer->platformLayer();
         updateRootLayerTransform();
         m_layerTreeView->setRootLayer(*m_rootLayer);
         // We register viewport layers here since there may not be a layer
         // tree view prior to this point.
-        visualViewport.registerLayersWithTreeView(m_layerTreeView);
+        registerViewportLayersWithCompositor();
         updatePageOverlays();
         // TODO(enne): Work around page visibility changes not being
         // propagated to the WebView in some circumstances.  This needs to
         // be refreshed here when setting a new root layer to avoid being
         // stuck in a presumed incorrectly invisible state.
         m_layerTreeView->setVisible(page()->isPageVisible());
     } else {
         m_rootGraphicsLayer = nullptr;
         m_visualViewportContainerLayer = nullptr;
         m_rootLayer = nullptr;
         // This means that we're transitioning to a new page. Suppress
         // commits until Blink generates invalidations so we don't
         // attempt to paint too early in the next page load.
         m_layerTreeView->setDeferCommits(true);
         m_layerTreeView->clearRootLayer();
-        visualViewport.clearLayersForTreeView(m_layerTreeView);
+        m_layerTreeView->clearViewportLayers();
     }
 }
 
 void WebViewImpl::invalidateRect(const IntRect& rect)
 {
     if (m_layerTreeView)
         updateLayerTreeViewport();
     else if (m_client)
         m_client->didInvalidateRect(rect);
 }
@@ skipping 302 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