(WIP) Invalidation during painting (for synchronized painting)

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 1077 matching lines @@
 
     lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation);
 
     RELEASE_ASSERT(layoutView());
     LayoutView& rootForPaintInvalidation = *layoutView();
     ASSERT(!rootForPaintInvalidation.needsLayout());
 
     TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInvalidation.debugName().ascii());
 
     rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);
+    invalidatePaintIfNeeded();
+    lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
+}
 
+void FrameView::invalidatePaintIfNeeded()
+{
     if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) {
         paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true);
         invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState, paintInvalidationState.paintInvalidationContainer());
         paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false);
     }
 
 #if ENABLE(ASSERT)
-    layoutView()->assertSubtreeClearedPaintInvalidationState();
+    if (!RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
+        layoutView()->assertSubtreeClearedPaintInvalidationState();
 #endif
 
     if (m_frame->selection().isCaretBoundsDirty())
         m_frame->selection().invalidateCaretRect();
 
     m_doFullPaintInvalidation = false;
-    lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
 
     // Temporary callback for crbug.com/487345,402044
     // TODO(ojan): Make this more general to be used by PositionObserver
     // and rAF throttling.
     IntRect visibleRect = rootFrameToContents(computeVisibleArea());
     rootForPaintInvalidation.sendMediaPositionChangeNotifications(visibleRect);
 }
 
 IntRect FrameView::computeVisibleArea()
 {
@@ skipping 1361 matching lines @@
             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();
             scrollContentsIfNeededRecursive();
 
             ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
             if (phases == AllPhases) {
-                invalidateTreeIfNeededRecursive();
+                if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+                    invalidateTreeIfNeededRecursive();
 
                 if (view->compositor()->inCompositingMode())
                     scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
 
                 updateCompositedSelectionIfNeeded();
             }
         }
 
         if (phases == AllPhases) {
             if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
@@ skipping 1621 matching lines @@
     return m_hiddenForThrottling && m_crossOriginForThrottling;
 }
 
 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
 {
     ASSERT(layoutView());
     return *layoutView();
 }
 
 } // namespace blink