| Index: sky/engine/core/dom/DocumentLifecycle.cpp
|
| diff --git a/sky/engine/core/dom/DocumentLifecycle.cpp b/sky/engine/core/dom/DocumentLifecycle.cpp
|
| index 484d82ce2c08bdbe9519ac470acb1eb12f5b4508..5c07cd2af6fdff31739374a88000317672c5c4ea 100644
|
| --- a/sky/engine/core/dom/DocumentLifecycle.cpp
|
| +++ b/sky/engine/core/dom/DocumentLifecycle.cpp
|
| @@ -127,17 +127,15 @@ bool DocumentLifecycle::canAdvanceTo(State state) const
|
| return true;
|
| return false;
|
| }
|
| - if (m_state == InPaintInvalidation) {
|
| - if (state == PaintInvalidationClean)
|
| - return true;
|
| - return false;
|
| - }
|
| - if (m_state == PaintInvalidationClean) {
|
| + if (m_state == StyleAndLayoutClean) {
|
| if (state == InStyleRecalc)
|
| return true;
|
| if (state == InPreLayout)
|
| return true;
|
| - if (state == InPaintInvalidation)
|
| + if (state == LayoutClean)
|
| + return true;
|
| + // We can pump frames without style or layout needing updating.
|
| + if (state == StyleAndLayoutClean)
|
| return true;
|
| return false;
|
| }
|
| @@ -149,7 +147,7 @@ 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 == AfterPerformLayout || m_state == LayoutClean || m_state == PaintInvalidationClean;
|
| + return m_state == StyleClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == StyleAndLayoutClean;
|
| }
|
|
|
| #endif
|
|
|