[SPv2] Paint invalidation in PreWalkTreeWalk, plumbed on PaintInvalidationState

third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp

Index: third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
diff --git a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
index e2cfc0f2a530d1e8cee30fe2a6edf601e9e8e083..8896014ec630d733d7ca0dc19e3af3b099e88566 100644
--- a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
@@ -206,24 +206,26 @@ bool DocumentLifecycle::canAdvanceTo(LifecycleState nextState) const
             return true;
         if (nextState == InCompositingUpdate)
             return true;
-        if (nextState == InPaintInvalidation)
+        if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
+            if (nextState == InPrePaint)
+                return true;
+        } else if (nextState == InPaintInvalidation) {
             return true;
+        }
         break;
     case InPaintInvalidation:
+        DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
         return nextState == PaintInvalidationClean;
     case PaintInvalidationClean:
+        DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
         if (nextState == InStyleRecalc)
             return true;
         if (nextState == InPreLayout)
             return true;
         if (nextState == InCompositingUpdate)
             return true;
-        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-            if (nextState == InPrePaint)
-                return true;
-        } else if (nextState == InPaint) {
+        if (nextState == InPaint)
             return true;
-        }
         break;
     case InPrePaint:
         if (nextState == PrePaintClean && RuntimeEnabledFeatures::slimmingPaintV2Enabled())