Turn off the old compositing path for SPv2.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 10 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/frame/FrameView.h"
 
 #include "core/HTMLNames.h"
 #include "core/MediaTypeNames.h"
+#include "core/animation/DocumentAnimations.h"
 #include "core/css/FontFaceSet.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/IntersectionObserverController.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/markers/DocumentMarkerController.h"
@@ skipping 23 matching lines @@
 #include "core/layout/LayoutView.h"
 #include "core/layout/ScrollAlignment.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/TracedLayoutObject.h"
 #include "core/layout/api/LayoutBoxModel.h"
 #include "core/layout/api/LayoutItem.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/CompositedSelection.h"
+#include "core/layout/compositing/CompositingInputsUpdater.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/observer/ResizeObserverController.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
@@ skipping 2431 matching lines @@
 }
 
 void FrameView::updateAllLifecyclePhases()
 {
     frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(DocumentLifecycle::PaintClean);
 }
 
 // TODO(chrishtr): add a scrolling update lifecycle phase.
 void FrameView::updateLifecycleToCompositingCleanPlusScrolling()
 {
-    frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(DocumentLifecycle::CompositingClean);
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        updateAllLifecyclePhasesExceptPaint();
+    else
+        frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(DocumentLifecycle::CompositingClean);
 }
 
 void FrameView::updateAllLifecyclePhasesExceptPaint()
 {
     frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(DocumentLifecycle::PrePaintClean);
 }
 
 void FrameView::updateLifecycleToLayoutClean()
 {
     frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(DocumentLifecycle::LayoutClean);
@@ skipping 84 matching lines @@
 
     if (LayoutViewItem view = layoutViewItem()) {
         forAllNonThrottledFrameViews([](FrameView& frameView) {
             frameView.checkDoesNotNeedLayout();
             frameView.m_allowsLayoutInvalidationAfterLayoutClean = false;
         });
 
         {
             TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get()));
 
-            // This was required for slimming paint v1 but is only temporarily
-            // needed for slimming paint v2.
-            view.compositor()->updateIfNeededRecursive();
+            if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+                view.compositor()->updateIfNeededRecursive();
+            } else {
+                DocumentAnimations::updateAnimations(layoutView()->document());
+
+                forAllNonThrottledFrameViews([](FrameView& frameView) { frameView.layoutView()->commitPendingSelection(); });
+            }
+
             scrollContentsIfNeededRecursive();
-
-            DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean);
+            DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() || lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
             m_frame->host()->globalRootScrollerController().didUpdateCompositing();
 
             if (targetState >= DocumentLifecycle::PrePaintClean) {
                 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
                     invalidateTreeIfNeededRecursive();
-
                 if (view.compositor()->inCompositingMode())
                     scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
 
                 updateCompositedSelectionIfNeeded();
             }
         }
 
         if (targetState >= DocumentLifecycle::PrePaintClean) {
-            if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
-                updatePaintProperties();
+            updatePaintProperties();
         }
 
         if (targetState == DocumentLifecycle::PaintClean) {
             if (!m_frame->document()->printing())
                 synchronizedPaint();
 
             if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
                 pushPaintArtifactToCompositor();
 
             DCHECK(!view.hasPendingSelection());
-            DCHECK((m_frame->document()->printing() && lifecycle().state() == DocumentLifecycle::PaintInvalidationClean)
+            DCHECK((m_frame->document()->printing() && lifecycle().state() == DocumentLifecycle::PrePaintClean)
                 || lifecycle().state() == DocumentLifecycle::PaintClean);
         }
 
         forAllNonThrottledFrameViews([](FrameView& frameView) {
             frameView.checkDoesNotNeedLayout();
             frameView.m_allowsLayoutInvalidationAfterLayoutClean = true;
         });
     }
 
     updateViewportIntersectionsForSubtree(targetState);
 }
 
 void FrameView::updatePaintProperties()
 {
     TRACE_EVENT0("blink", "FrameView::updatePaintProperties");
 
-    DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
+    if (!m_paintController)
+        m_paintController = PaintController::create();
 
     forAllNonThrottledFrameViews([](FrameView& frameView) { frameView.lifecycle().advanceTo(DocumentLifecycle::InPrePaint); });
-    PrePaintTreeWalk().walk(*this);
+
+    // TODO(chrishtr): merge this into the actual pre-paint tree walk.
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        forAllNonThrottledFrameViews([](FrameView& frameView) { CompositingInputsUpdater(frameView.layoutView()->layer()).update(); });
+
+    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
+        PrePaintTreeWalk().walk(*this);
+
     forAllNonThrottledFrameViews([](FrameView& frameView) { frameView.lifecycle().advanceTo(DocumentLifecycle::PrePaintClean); });
 }
 
 void FrameView::synchronizedPaint()
 {
     TRACE_EVENT0("blink", "FrameView::synchronizedPaint");
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Paint.UpdateTime");
 
     ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame()));
 
     LayoutViewItem view = layoutViewItem();
     ASSERT(!view.isNull());
     forAllNonThrottledFrameViews([](FrameView& frameView) { frameView.lifecycle().advanceTo(DocumentLifecycle::InPaint); });
 
-    // A null graphics layer can occur for painting of SVG images that are not parented into the main frame tree,
-    // or when the FrameView is the main frame view of a page overlay. The page overlay is in the layer tree of
-    // the host page and will be painted during synchronized painting of the host page.
-    if (GraphicsLayer* rootGraphicsLayer = view.compositor()->rootGraphicsLayer()) {
-        synchronizedPaintRecursively(rootGraphicsLayer);
-    }
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        if (layoutView()->layer()->needsRepaint()) {
+            GraphicsContext graphicsContext(*m_paintController);
+            paint(graphicsContext, CullRect(LayoutRect::infiniteIntRect()));
+            m_paintController->commitNewDisplayItems(LayoutSize());
+        }
+    } else {
+        // A null graphics layer can occur for painting of SVG images that are not parented into the main frame tree,
+        // or when the FrameView is the main frame view of a page overlay. The page overlay is in the layer tree of
+        // the host page and will be painted during synchronized painting of the host page.
+        if (GraphicsLayer* rootGraphicsLayer = view.compositor()->rootGraphicsLayer()) {
+            synchronizedPaintRecursively(rootGraphicsLayer);
+        }
 
-    // TODO(sataya.m):Main frame doesn't create RootFrameViewport in some
-    // webkit_unit_tests (http://crbug.com/644788).
-    if (m_viewportScrollableArea) {
-        if (GraphicsLayer* layerForHorizontalScrollbar = m_viewportScrollableArea->layerForHorizontalScrollbar()) {
-            synchronizedPaintRecursively(layerForHorizontalScrollbar);
-        }
-        if (GraphicsLayer* layerForVerticalScrollbar = m_viewportScrollableArea->layerForVerticalScrollbar()) {
-            synchronizedPaintRecursively(layerForVerticalScrollbar);
-        }
-        if (GraphicsLayer* layerForScrollCorner = m_viewportScrollableArea->layerForScrollCorner()) {
-            synchronizedPaintRecursively(layerForScrollCorner);
+        // TODO(sataya.m):Main frame doesn't create RootFrameViewport in some
+        // webkit_unit_tests (http://crbug.com/644788).
+        if (m_viewportScrollableArea) {
+            if (GraphicsLayer* layerForHorizontalScrollbar = m_viewportScrollableArea->layerForHorizontalScrollbar()) {
+                synchronizedPaintRecursively(layerForHorizontalScrollbar);
+            }
+            if (GraphicsLayer* layerForVerticalScrollbar = m_viewportScrollableArea->layerForVerticalScrollbar()) {
+                synchronizedPaintRecursively(layerForVerticalScrollbar);
+            }
+            if (GraphicsLayer* layerForScrollCorner = m_viewportScrollableArea->layerForScrollCorner()) {
+                synchronizedPaintRecursively(layerForScrollCorner);
+            }
         }
     }
 
     forAllNonThrottledFrameViews([](FrameView& frameView) {
         frameView.lifecycle().advanceTo(DocumentLifecycle::PaintClean);
         LayoutViewItem layoutViewItem = frameView.layoutViewItem();
         if (!layoutViewItem.isNull())
             layoutViewItem.layer()->clearNeedsRepaintRecursively();
     });
 }
@@ skipping 15 matching lines @@
     for (auto& child : graphicsLayer->children())
         synchronizedPaintRecursively(child);
 }
 
 void FrameView::pushPaintArtifactToCompositor()
 {
     TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor");
 
     ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
-    LayoutViewItem viewItem = layoutViewItem();
-    ASSERT(!viewItem.isNull());
-
-    // TODO(jbroman): Simplify the path to PaintController.
-    PaintLayer* layer = viewItem.layer();
-    ASSERT(layer);
-    if (!layer->hasCompositedLayerMapping())
-        return;
-    GraphicsLayer* rootGraphicsLayer = layer->compositedLayerMapping()->mainGraphicsLayer();
-    if (!rootGraphicsLayer->drawsContent())
-        return;
-    const PaintArtifact& paintArtifact = rootGraphicsLayer->getPaintController().paintArtifact();
+    const PaintArtifact& paintArtifact = m_paintController->paintArtifact();
 
     Page* page = frame().page();
     if (!page)
         return;
     page->chromeClient().didPaint(paintArtifact);
 }
 
 void FrameView::updateStyleAndLayoutIfNeededRecursive()
 {
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.StyleAndLayout.UpdateTime");
@@ skipping 1584 matching lines @@
 }
 
 bool FrameView::canThrottleRendering() const
 {
     if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
         return false;
     return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrottling);
 }
 
 } // namespace blink