Slimming Paint phase 2 compositing algorithm plumbing

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/DocumentLifecycle.h"
 
+#include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 static DocumentLifecycle::DeprecatedTransition* s_deprecatedTransitionStack = 0;
 
 DocumentLifecycle::Scope::Scope(DocumentLifecycle& lifecycle, State finalState)
     : m_lifecycle(lifecycle)
     , m_finalState(finalState)
 {
@@ skipping 143 matching lines @@
         break;
     case InPaintInvalidation:
         return state == PaintInvalidationClean;
     case PaintInvalidationClean:
         if (state == InStyleRecalc)
             return true;
         if (state == InPreLayout)
             return true;
         if (state == InCompositingUpdate)
             return true;
+        if (state == InPaintForSlimmingPaintV2 && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return true;
+        break;
+    case InPaintForSlimmingPaintV2:
+        if (state == PaintForSlimmingPaintV2Clean && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return true;
+        break;
+    case PaintForSlimmingPaintV2Clean:
+        if (state == InCompositingForSlimmingPaintV2 && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return true;
+        break;
+    case InCompositingForSlimmingPaintV2:
+        if (state == CompositingForSlimmingPaintV2Clean && RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return true;
+        break;
+    case CompositingForSlimmingPaintV2Clean:
+        if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return false;
+        if (state == InCompositingUpdate)
+            return true;
+        if (state == CompositingForSlimmingPaintV2Clean)
+            return true;
         break;
     case Stopping:
         return state == Stopped;
     case Stopped:
         return state == Disposed;
     case Disposed:
         // FIXME: We can dispose a document multiple times. This seems wrong.
         // See https://code.google.com/p/chromium/issues/detail?id=301668.
         return state == Disposed;
     }
     return false;
 }
 
 bool DocumentLifecycle::canRewindTo(State state) const
 {
     // This transition is bogus, but we've whitelisted it anyway.
     if (s_deprecatedTransitionStack && m_state == s_deprecatedTransitionStack->from() && state == s_deprecatedTransitionStack->to())
         return true;
-    return m_state == StyleClean || m_state == LayoutSubtreeChangeClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == CompositingClean || m_state == PaintInvalidationClean;
+    return m_state == StyleClean
+        || m_state == LayoutSubtreeChangeClean
+        || m_state == AfterPerformLayout
+        || m_state == LayoutClean
+        || m_state == CompositingClean
+        || m_state == PaintInvalidationClean
+        || (m_state == CompositingForSlimmingPaintV2Clean && RuntimeEnabledFeatures::slimmingPaintV2Enabled());

[chrishtr, 2015/08/13 21:33:16]

Also include CompositingForSlimmingPaintV2Clean.

[pdr., 2015/08/14 00:10:29]

Done

 }
 
 #endif
 
 void DocumentLifecycle::advanceTo(State state)
 {
     ASSERT(canAdvanceTo(state));
     m_state = state;
 }
 
 void DocumentLifecycle::ensureStateAtMost(State state)
 {
     ASSERT(state == VisualUpdatePending || state == StyleClean || state == LayoutClean);
     if (m_state <= state)
         return;
     ASSERT(canRewindTo(state));
     m_state = state;
 }
 
 }