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

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

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cleanup Created 6 years 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
Index: sky/engine/core/dom/DocumentLifecycle.cpp
diff --git a/sky/engine/core/dom/DocumentLifecycle.cpp b/sky/engine/core/dom/DocumentLifecycle.cpp
index 77763d2cc0bcbf481e99153c08076f025bb62e55..a72e080ddfd8566bcbe17c8c5547329637fb6f6c 100644
--- a/sky/engine/core/dom/DocumentLifecycle.cpp
+++ b/sky/engine/core/dom/DocumentLifecycle.cpp
@@ -127,15 +127,6 @@ bool DocumentLifecycle::canAdvanceTo(State state) const
return true;
return false;
}
- 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;
@@ -146,8 +137,6 @@ bool DocumentLifecycle::canAdvanceTo(State state) const
return true;
if (state == InPreLayout)
return true;
- if (state == InCompositingUpdate)
- return true;
return false;
}
return false;
@@ -158,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 == CompositingClean || m_state == PaintInvalidationClean;
+ return m_state == StyleClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == PaintInvalidationClean;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698