Refactor the way PaintArtifactCompositor is attached and used.

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 2768 matching lines @@
         break;
 
     default:
         NOTIMPLEMENTED();
         break;
     }
 }
 
 bool WebViewImpl::isAcceleratedCompositingActive() const
 {
-    // For SPv2, accelerated compositing is managed by the
-    // PaintArtifactCompositor.
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-        return m_paintArtifactCompositor.rootLayer();
-
     return m_rootLayer;
 }
 
 void WebViewImpl::willCloseLayerTreeView()
 {
     if (m_linkHighlightsTimeline) {
         m_linkHighlights.clear();
         detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
         m_linkHighlightsTimeline.reset();
     }
 
     if (m_layerTreeView)
         page()->willCloseLayerTreeView(*m_layerTreeView);
 
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-        detachPaintArtifactCompositor();
-    else
-        setRootGraphicsLayer(nullptr);
+    setRootLayer(nullptr);
 
     m_mutator = nullptr;
     m_layerTreeView = nullptr;
 }
 
 void WebViewImpl::didAcquirePointerLock()
 {
     if (page())
         page()->pointerLockController().didAcquirePointerLock();
 }
@@ skipping 1413 matching lines @@
     // the mehtod.
     visualViewport.setScrollLayerOnScrollbars(layoutViewportWebLayer);
 
     m_layerTreeView->registerViewportLayers(
         visualViewport.overscrollElasticityLayer()->platformLayer(),
         visualViewport.pageScaleLayer()->platformLayer(),
         visualViewport.scrollLayer()->platformLayer(),
         layoutViewportWebLayer);
 }
 
-void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
+void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* graphicsLayer)
 {
     if (!m_layerTreeView)
         return;
 
-    // In SPv2, we attach layers via PaintArtifactCompositor, rather than
-    // supplying a root GraphicsLayer from PaintLayerCompositor.
+    // In SPv2, setRootLayer is used instead.
     DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
-    visualViewport.attachToLayerTree(layer);
-    if (layer) {
+    visualViewport.attachToLayerTree(graphicsLayer);
+    if (graphicsLayer) {
         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.
         registerViewportLayersWithCompositor();
 
         // 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();
         m_layerTreeView->clearViewportLayers();
         if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
             devTools->rootLayerCleared();
     }
 }
 
+void WebViewImpl::setRootLayer(WebLayer* layer)
+{
+    if (!m_layerTreeView)
+        return;
+
+    if (layer) {
+        m_rootLayer = layer;
+        m_layerTreeView->setRootLayer(*m_rootLayer);
+        m_layerTreeView->setVisible(page()->isPageVisible());
+    } else {
+        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();
+        m_layerTreeView->clearViewportLayers();
+        if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
+            devTools->rootLayerCleared();
+    }
+}
+
 void WebViewImpl::invalidateRect(const IntRect& rect)
 {
     if (m_layerTreeView) {
         updateLayerTreeViewport();
     } else if (m_client) {
         // This is only for WebViewPlugin.
         m_client->widgetClient()->didInvalidateRect(rect);
     }
 }
 
@@ skipping 52 matching lines @@
         m_page->layerTreeViewInitialized(*m_layerTreeView);
 
     // FIXME: only unittests, click to play, Android printing, and printing (for headers and footers)
     // make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.
     DCHECK(m_layerTreeView || !m_client || m_client->widgetClient()->allowsBrokenNullLayerTreeView());
 
     if (Platform::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
         m_linkHighlightsTimeline = CompositorAnimationTimeline::create();
         attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
     }
-
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-        attachPaintArtifactCompositor();
 }
 
 void WebViewImpl::applyViewportDeltas(
     const WebFloatSize& visualViewportDelta,
     // TODO(bokan): This parameter is to be removed but requires adjusting many
     // callsites.
     const WebFloatSize&,
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
     float topControlsShownRatioDelta)
@@ skipping 177 matching lines @@
 {
     if (m_pageColorOverlay)
         m_pageColorOverlay->update();
     if (InspectorOverlay* overlay = inspectorOverlay()) {
         PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
         if (inspectorPageOverlay)
             inspectorPageOverlay->update();
     }
 }
 
-void WebViewImpl::attachPaintArtifactCompositor()
-{
-    if (!m_layerTreeView)
-        return;
-
-    // Otherwise, PaintLayerCompositor is expected to supply a root
-    // GraphicsLayer via setRootGraphicsLayer.
-    DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
-
-    // TODO(jbroman): This should probably have hookups for overlays, visual
-    // viewport, etc.
-
-    WebLayer* rootLayer = m_paintArtifactCompositor.getWebLayer();
-    DCHECK(rootLayer);
-    m_layerTreeView->setRootLayer(*rootLayer);
-
-    // TODO(jbroman): This is cargo-culted from setRootGraphicsLayer. Is it
-    // necessary?
-    m_layerTreeView->setVisible(page()->isPageVisible());
-}
-
-void WebViewImpl::detachPaintArtifactCompositor()
-{
-    if (!m_layerTreeView)
-        return;
-
-    m_layerTreeView->setDeferCommits(true);
-    m_layerTreeView->clearRootLayer();
-}
-
 float WebViewImpl::deviceScaleFactor() const
 {
     // 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();
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameInWidget() const
 {
     if (!mainFrameImpl())
         return nullptr;
 
     LocalFrame* focusedFrame = toLocalFrame(focusedCoreFrame());
     if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink