Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: sky/engine/core/dom/DocumentLifecycle.cpp

Issue 847393003: Remove the PaintInvalidation DocumentLifeCycle states. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/DocumentLifecycle.h ('k') | sky/engine/core/editing/FrameSelection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « sky/engine/core/dom/DocumentLifecycle.h ('k') | sky/engine/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698