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

Unified Diff: sky/engine/core/animation/css/CSSAnimations.cpp

Issue 768493002: Get rid of CompositingState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix incorrect case. Created 6 years, 1 month 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/animation/css/CSSAnimations.cpp
diff --git a/sky/engine/core/animation/css/CSSAnimations.cpp b/sky/engine/core/animation/css/CSSAnimations.cpp
index 58df33bc4d466db4db0edacbe001c7050db26946..dcfbcef3b33aa4d68979130220b8a9c9562df16b 100644
--- a/sky/engine/core/animation/css/CSSAnimations.cpp
+++ b/sky/engine/core/animation/css/CSSAnimations.cpp
@@ -298,11 +298,6 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element)
m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolationsForAnimations());
- // FIXME: cancelling, pausing, unpausing animations all query compositingState, which is not necessarily up to date here
- // since we call this from recalc style.
- // https://code.google.com/p/chromium/issues/detail?id=339847
- DisableCompositingQueryAsserts disabler;
-
for (Vector<AtomicString>::const_iterator iter = update->cancelledAnimationNames().begin(); iter != update->cancelledAnimationNames().end(); ++iter) {
RefPtr<AnimationPlayer> player = m_animations.take(*iter);
player->cancel();

Powered by Google App Engine
This is Rietveld 408576698