Index: ui/compositor/layer_animation_sequence.cc |
=================================================================== |
--- ui/compositor/layer_animation_sequence.cc (revision 157564) |
+++ ui/compositor/layer_animation_sequence.cc (working copy) |
@@ -31,12 +31,12 @@ |
DetachedFromSequence(this, true)); |
} |
-void LayerAnimationSequence::Progress(base::TimeDelta elapsed, |
+bool LayerAnimationSequence::Progress(base::TimeDelta elapsed, |
LayerAnimationDelegate* delegate) { |
bool redraw_required = false; |
if (elements_.empty()) |
- return; |
+ return redraw_required; |
if (is_cyclic_ && duration_ > base::TimeDelta()) { |
// If delta = elapsed - last_start_ is huge, we can skip ahead by complete |
@@ -69,16 +69,13 @@ |
redraw_required = true; |
} |
- // Since the delegate may be deleted due to the notifications below, it is |
- // important that we schedule a draw before sending them. |
- if (redraw_required) |
- delegate->ScheduleDrawForAnimation(); |
- |
if (!is_cyclic_ && elapsed == duration_) { |
last_element_ = 0; |
last_start_ = base::TimeDelta::FromMilliseconds(0); |
NotifyEnded(); |
} |
+ |
+ return redraw_required; |
} |
void LayerAnimationSequence::GetTargetValue( |