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

Unified Diff: ui/compositor/layer_animation_element.cc

Issue 18660005: Make ui::ThreadedTransformTransition::OnAbort correctly check whether the animation has started (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | ui/compositor/layer_animation_element_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_element.cc
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc
index 1234a04160fd5b11ddc62f835fd262d8e2f1dfc8..f70c1084a1db9e134227c54e7a883c83fc2e6433 100644
--- a/ui/compositor/layer_animation_element.cc
+++ b/ui/compositor/layer_animation_element.cc
@@ -517,7 +517,7 @@ class ThreadedTransformTransition : public ThreadedLayerAnimationElement {
}
virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {
- if (delegate && animation_id()) {
+ if (delegate && Started()) {
ThreadedLayerAnimationElement::OnAbort(delegate);
delegate->SetTransformFromAnimation(Tween::ValueBetween(
Tween::CalculateValue(tween_type(), last_progressed_fraction()),
« no previous file with comments | « no previous file | ui/compositor/layer_animation_element_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698