Moved viewport layer registration into WebViewImpl.

third_party/WebKit/Source/core/frame/VisualViewport.cpp

 /*
  * Copyright (C) 2013 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 35 matching lines @@
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "platform/Histogram.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeOverlay.h"
 #include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebLayer.h"
-#include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebScrollbar.h"
 #include "public/platform/WebScrollbarLayer.h"
 #include <memory>
 
-using blink::WebLayer;
-using blink::WebLayerTreeView;
-using blink::WebScrollbar;
-using blink::WebScrollbarLayer;
-using blink::FrameHost;
-using blink::GraphicsLayer;
-
 namespace blink {
 
 VisualViewport::VisualViewport(FrameHost& owner)
     : m_frameHost(&owner)
     , m_scale(1)
     , m_topControlsAdjustment(0)
     , m_maxPageScale(-1)
     , m_trackPinchZoomStatsForPage(false)
 {
     reset();
@@ skipping 390 matching lines @@
     int yPosition = isHorizontal ? m_innerViewportContainerLayer->size().height() - scrollbarThickness : 0;
     int width = isHorizontal ? m_innerViewportContainerLayer->size().width() - scrollbarThickness : scrollbarThickness;
     int height = isHorizontal ? scrollbarThickness : m_innerViewportContainerLayer->size().height() - scrollbarThickness;
 
     // Use the GraphicsLayer to position the scrollbars.
     scrollbarGraphicsLayer->setPosition(IntPoint(xPosition, yPosition));
     scrollbarGraphicsLayer->setSize(FloatSize(width, height));
     scrollbarGraphicsLayer->setContentsRect(IntRect(0, 0, width, height));
 }
 
-void VisualViewport::registerLayersWithTreeView(WebLayerTreeView* layerTreeView) const
+void VisualViewport::setScrollLayerOnScrollbars(WebLayer* scrollLayer) const
 {
-    TRACE_EVENT0("blink", "VisualViewport::registerLayersWithTreeView");
-    ASSERT(layerTreeView);
-
-    if (!mainFrame())
-        return;
-
-    ASSERT(!frameHost().page().deprecatedLocalMainFrame()->contentLayoutItem().isNull());
-
-    PaintLayerCompositor* compositor = frameHost().page().deprecatedLocalMainFrame()->contentLayoutItem().compositor();
-    // Get the outer viewport scroll layer.
-    WebLayer* scrollLayer = compositor->scrollLayer() ? compositor->scrollLayer()->platformLayer() : 0;
-
+    // TODO(bokan): This is currently done while registering viewport layers
+    // with the compositor but could it actually be done earlier, like in
+    // setupScrollbars? Then we wouldn't need this method.
     m_webOverlayScrollbarHorizontal->setScrollLayer(scrollLayer);
     m_webOverlayScrollbarVertical->setScrollLayer(scrollLayer);
-
-    ASSERT(compositor);
-    layerTreeView->registerViewportLayers(
-        m_overscrollElasticityLayer->platformLayer(),
-        m_pageScaleLayer->platformLayer(),
-        m_innerViewportScrollLayer->platformLayer(),
-        scrollLayer);
 }
 
 bool VisualViewport::visualViewportSuppliesScrollbars() const
 {
     return frameHost().settings().viewportEnabled();
 }
 
 bool VisualViewport::scrollAnimatorEnabled() const
 {
     return frameHost().settings().scrollAnimatorEnabled();
 }
 
-void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) const
-{
-    ASSERT(layerTreeView);
-
-    layerTreeView->clearViewportLayers();
-}
-
 HostWindow* VisualViewport::getHostWindow() const
 {
     return &frameHost().chromeClient();
 }
 
 DoubleRect VisualViewport::visibleContentRectDouble(IncludeScrollbarsInRect) const
 {
     return visibleRect();
 }
 
@@ skipping 301 matching lines @@
     } else if (graphicsLayer == m_rootTransformLayer.get()) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink