[SPv2] Paint invalidation in PreWalkTreeWalk, plumbed on PaintInvalidationState

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 188 matching lines @@
         break;
     case InCompositingUpdate:
         return nextState == CompositingClean;
     case CompositingClean:
         if (nextState == InStyleRecalc)
             return true;
         if (nextState == InPreLayout)
             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())
             return true;
         break;
     case PrePaintClean:
         if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
             break;
         if (nextState == InPaint)
             return true;
@@ skipping 97 matching lines @@
         DEBUG_STRING_CASE(Stopping);
         DEBUG_STRING_CASE(Stopped);
     }
 
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 #endif
 
 } // namespace blink