(WIP) Invalidation during painting (for synchronized painting)

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

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 05c65b4af6f909da3e4182b525a67d124ed1a954..dbe6eebd1ace414a6b234d4969752eb89a9541fc 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1095,7 +1095,12 @@ void FrameView::invalidateTreeIfNeeded(PaintInvalidationState& paintInvalidation
     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());
@@ -1103,14 +1108,14 @@ void FrameView::invalidateTreeIfNeeded(PaintInvalidationState& paintInvalidation
     }
 
 #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
@@ -2492,7 +2497,8 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases)
             ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
             if (phases == AllPhases) {
-                invalidateTreeIfNeededRecursive();
+                if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+                    invalidateTreeIfNeededRecursive();
 
                 if (view->compositor()->inCompositingMode())
                     scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();