Slimming Paint phase 2 compositing algorithm plumbing

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 11 matching lines @@
  * 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 "config.h"
 #include "core/frame/FrameView.h"
 
 #include "core/HTMLNames.h"
 #include "core/MediaTypeNames.h"
+#include "core/compositing/DisplayListCompositingBuilder.h"
 #include "core/css/FontFaceSet.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/Fullscreen.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
@@ skipping 43 matching lines @@
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
 #include "platform/TracedValue.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/GraphicsLayerDebugInfo.h"
+#include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/scroll/ScrollAnimator.h"
 #include "platform/text/TextStream.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 2327 matching lines @@
     m_needsUpdateWidgetPositions = false;
 
     updateWidgetPositions();
 }
 
 void FrameView::updateAllLifecyclePhases()
 {
     frame().localFrameRoot()->view()->updateAllLifecyclePhasesInternal();
 }
 
-// TODO(chrishtr): add a scrolling update lifecycle phase, after compositing and before invalidation.
+// TODO(chrishtr): add a scrolling update lifecycle phase.
 void FrameView::updateLifecycleToCompositingCleanPlusScrolling()
 {
     frame().localFrameRoot()->view()->updateStyleAndLayoutIfNeededRecursive();
     LayoutView* view = layoutView();
-    if (view)
+    if (view) {
+        // For SlimmingPaintV2, we still need this to set up the root layer(s).
         view->compositor()->updateIfNeededRecursive();

[chrishtr, 2015/08/13 21:33:16]

Change comment to say that this is just needed in SP v2 for temporary plumbing
purposes, but is always required for v1.

[pdr., 2015/08/14 00:10:29]

Done

+    }
+
     scrollContentsIfNeededRecursive();
 
+    if (view && RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        paintForSlimmingPaintV2();
+        compositeForSlimmingPaintV2();
+    }
+
     ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean);
 }
 
 void FrameView::updateAllLifecyclePhasesInternal()
 {
     // This must be called from the root frame, since it recurses down, not up. Otherwise the lifecycles of the frames might be out of sync.
     ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame()));
 
     // Updating layout can run script, which can tear down the FrameView.
     RefPtrWillBeRawPtr<FrameView> protector(this);
 
     updateStyleAndLayoutIfNeededRecursive();
 
     LayoutView* view = layoutView();
     if (view) {
         TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get()));
 
+        // For SlimmingPaintV2, we still need this to set up the root layer(s).

[chrishtr, 2015/08/13 21:33:16]

Fix comment like above.

[pdr., 2015/08/14 00:10:29]

Done

         view->compositor()->updateIfNeededRecursive();
         scrollContentsIfNeededRecursive();
         invalidateTreeIfNeededRecursive();
+        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+            paintForSlimmingPaintV2();
+            compositeForSlimmingPaintV2();
+        }
         updatePostLifecycleData();
 
         ASSERT(!view->hasPendingSelection());
     }
 
-    ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
+    ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean
+        || (RuntimeEnabledFeatures::slimmingPaintV2Enabled() && lifecycle().state() == DocumentLifecycle::CompositingForSlimmingPaintV2Clean));
+}
+
+void FrameView::paintForSlimmingPaintV2()
+{
+    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+    ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame()));
+
+    LayoutView* view = layoutView();
+    ASSERT(view);
+    GraphicsLayer* rootGraphicsLayer = view->layer()->graphicsLayerBacking();
+
+    // Detached frames can have no root graphics layer.
+    if (!rootGraphicsLayer)
+        return;
+
+    lifecycle().advanceTo(DocumentLifecycle::InPaintForSlimmingPaintV2);
+
+    // TODO: Update callers to pass in the interest rect.

[chrishtr, 2015/08/13 21:33:16]

TODO(pdr)

[pdr., 2015/08/14 00:10:29]

Done

+    IntRect interestRect = LayoutRect::infiniteIntRect();
+    GraphicsContext context(rootGraphicsLayer->displayItemList());
+    rootGraphicsLayer->paint(context, interestRect);
+
+    lifecycle().advanceTo(DocumentLifecycle::PaintForSlimmingPaintV2Clean);
+}
+
+void FrameView::compositeForSlimmingPaintV2()
+{
+    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+    ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame()));
+
+    GraphicsLayer* rootGraphicsLayer = layoutView()->layer()->graphicsLayerBacking();
+
+    // Detached frames can have no root graphics layer.
+    if (!rootGraphicsLayer)
+        return;
+
+    lifecycle().advanceTo(DocumentLifecycle::InCompositingForSlimmingPaintV2);
+
+    DisplayListDiff displayListDiff;
+    rootGraphicsLayer->displayItemList()->commitNewDisplayItems(&displayListDiff);
+
+    CompositedDisplayList compositedDisplayList(*rootGraphicsLayer->displayItemList(), displayListDiff, *rootGraphicsLayer);
+    DisplayListCompositingBuilder compositingBuilder(compositedDisplayList);
+    compositingBuilder.build();
+
+    lifecycle().advanceTo(DocumentLifecycle::CompositingForSlimmingPaintV2Clean);
 }
 
 void FrameView::updatePostLifecycleData()
 {
     LayoutView* view = layoutView();
     ASSERT(view);
 
     if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot())
         scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
 
@@ skipping 1447 matching lines @@
 
     if (!graphicsLayer)
         return;
 
     DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObject(), paintInvalidationContainer, viewRect);
 
     graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, WebRect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosingIntRect(viewRect)));
 }
 
 } // namespace blink