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

Unified Diff: Source/core/dom/DocumentLifecycle.cpp

Issue 406743002: Make PaintInvalidation a DocumentLifecyle state (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | « Source/core/dom/DocumentLifecycle.h ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentLifecycle.cpp
diff --git a/Source/core/dom/DocumentLifecycle.cpp b/Source/core/dom/DocumentLifecycle.cpp
index fcad629fdd4a5db361405adeadd4348e0a4b0448..b8f0d198767213bc8b2b176e950f81214b2db308 100644
--- a/Source/core/dom/DocumentLifecycle.cpp
+++ b/Source/core/dom/DocumentLifecycle.cpp
@@ -130,6 +130,20 @@ bool DocumentLifecycle::canAdvanceTo(State state) const
if (m_state == CompositingClean) {
if (state == InStyleRecalc)
return true;
+ if (state == InCompositingUpdate)
+ return true;
+ if (state == InPaintInvalidation)
+ return true;
+ return false;
+ }
+ if (m_state == InPaintInvalidation) {
+ if (state == PaintInvalidationClean)
+ return true;
+ return false;
+ }
+ if (m_state == PaintInvalidationClean) {
+ if (state == InStyleRecalc)
+ return true;
if (state == InPreLayout)
return true;
if (state == InCompositingUpdate)
@@ -144,7 +158,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 == CompositingClean;
+ return m_state == StyleClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == CompositingClean || m_state == PaintInvalidationClean;
}
#endif
« no previous file with comments | « Source/core/dom/DocumentLifecycle.h ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698