New paint invalidation using paint property tree walk

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 5e9e11c7bdf9c8dbfd5f116d04963ba18d66f48c..cdc464208d0d71c26746cba1a8ba81d63e361c82 100644
--- a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp
@@ -197,12 +197,18 @@ bool DocumentLifecycle::canAdvanceTo(LifecycleState nextState) const
             return true;
         if (nextState == InCompositingUpdate)
             return true;
-        if (nextState == InPaintInvalidation)
+        if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
+            if (nextState == InPrePaintTreeWalk)
+                return true;
+        } else if (nextState == InPaintInvalidation) {
             return true;
+        }
         break;
     case InPaintInvalidation:
+        ASSERT(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
         return nextState == PaintInvalidationClean;
     case PaintInvalidationClean:
+        ASSERT(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
         if (nextState == InStyleRecalc)
             return true;
         if (nextState == InPreLayout)
@@ -210,18 +216,18 @@ bool DocumentLifecycle::canAdvanceTo(LifecycleState nextState) const
         if (nextState == InCompositingUpdate)
             return true;
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-            if (nextState == InUpdatePaintProperties)
+            if (nextState == InPrePaintTreeWalk)
                 return true;
         } else if (nextState == InPaint) {
             return true;
         }
         break;
-    case InUpdatePaintProperties:
-        if (nextState == UpdatePaintPropertiesClean && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+    case InPrePaintTreeWalk:
+        if (nextState == PrePaintTreeWalkClean && (RuntimeEnabledFeatures::slimmingPaintV2Enabled() || RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()))
             return true;
         break;
-    case UpdatePaintPropertiesClean:
-        if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+    case PrePaintTreeWalkClean:
+        if (nextState == InPaint && (RuntimeEnabledFeatures::slimmingPaintV2Enabled() || RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()))
             return true;
         break;
     case InPaint:
@@ -308,8 +314,8 @@ const char* DocumentLifecycle::stateAsDebugString(const LifecycleState state)
         DEBUG_STRING_CASE(CompositingClean);
         DEBUG_STRING_CASE(InPaintInvalidation);
         DEBUG_STRING_CASE(PaintInvalidationClean);
-        DEBUG_STRING_CASE(InUpdatePaintProperties);
-        DEBUG_STRING_CASE(UpdatePaintPropertiesClean);
+        DEBUG_STRING_CASE(InPrePaintTreeWalk);
+        DEBUG_STRING_CASE(PrePaintTreeWalkClean);
         DEBUG_STRING_CASE(InPaint);
         DEBUG_STRING_CASE(PaintClean);
         DEBUG_STRING_CASE(Stopping);