Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / animation / layer_animation_controller.cc

diff --git a/src/cc/animation/layer_animation_controller.cc b/src/cc/animation/layer_animation_controller.cc
index fbd02f3..08a0ee9 100644 (file)
--- a/src/cc/animation/layer_animation_controller.cc
+++ b/src/cc/animation/layer_animation_controller.cc
@@ -144,6 +144,9 @@ void LayerAnimationController::AccumulatePropertyUpdates(
     if (!animation->is_impl_only())
       continue;
 
+    if (!animation->InEffect(monotonic_time))
+      continue;
+
     double trimmed = animation->TrimTimeToCurrentIteration(monotonic_time);
     switch (animation->target_property()) {
       case Animation::Opacity: {
@@ -835,6 +838,9 @@ void LayerAnimationController::TickAnimations(base::TimeTicks monotonic_time) {
     if (animations_[i]->run_state() == Animation::Starting ||
         animations_[i]->run_state() == Animation::Running ||
         animations_[i]->run_state() == Animation::Paused) {
+      if (!animations_[i]->InEffect(monotonic_time))
+        continue;
+
       double trimmed =
           animations_[i]->TrimTimeToCurrentIteration(monotonic_time);