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

Unified Diff: sky/engine/core/dom/Element.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
« no previous file with comments | « sky/engine/core/dom/DocumentLifecycle.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Element.cpp
diff --git a/sky/engine/core/dom/Element.cpp b/sky/engine/core/dom/Element.cpp
index fe8bfd40b8c84f4d7d9a8c97405e34c05c96cdd0..053a8d4ef1808b7c587636f9b386436070d5a65c 100644
--- a/sky/engine/core/dom/Element.cpp
+++ b/sky/engine/core/dom/Element.cpp
@@ -842,7 +842,8 @@ void Element::detach(const AttachContext& context)
if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
if (context.performingReattach) {
// FIXME: restart compositor animations rather than pull back to the main thread
- activeAnimations->cancelAnimationOnCompositor();
+ // FIXME(rafaelw): What should we do here?
+ // activeAnimations->cancelAnimationOnCompositor();
esprehn 2014/12/02 07:02:02 I don't think we need to do anything, the animatio
} else {
activeAnimations->cssAnimations().cancel();
activeAnimations->setAnimationStyleChange(false);
@@ -870,7 +871,6 @@ PassRefPtr<RenderStyle> Element::styleForRenderer()
// styleForElement() might add active animations so we need to get it again.
if (ActiveAnimations* activeAnimations = this->activeAnimations()) {
activeAnimations->cssAnimations().maybeApplyPendingUpdate(this);
- activeAnimations->updateAnimationFlags(*style);
}
if (style->hasTransform()) {
« no previous file with comments | « sky/engine/core/dom/DocumentLifecycle.cpp ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698