Index: Source/core/dom/DocumentLifecycle.cpp |
diff --git a/Source/core/dom/DocumentLifecycle.cpp b/Source/core/dom/DocumentLifecycle.cpp |
index 25abf3c9c49481710b9a62c380547cdd91aec1c1..2b658147f09663aff48c2de2c426b26370d27b55 100644 |
--- a/Source/core/dom/DocumentLifecycle.cpp |
+++ b/Source/core/dom/DocumentLifecycle.cpp |
@@ -31,6 +31,7 @@ |
#include "config.h" |
#include "core/dom/DocumentLifecycle.h" |
+#include "platform/RuntimeEnabledFeatures.h" |
#include "wtf/Assertions.h" |
namespace blink { |
@@ -194,6 +195,28 @@ bool DocumentLifecycle::canAdvanceTo(State state) const |
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; |
@@ -212,7 +235,13 @@ 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 |