| Index: cc/animation/layer_animation_controller.cc
|
| diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
|
| index 0088c3dde8ed422451abc14a11f5059fa7df5a55..c42118839857c3fe8c4ae5d856c9da0a9ca7f2a2 100644
|
| --- a/cc/animation/layer_animation_controller.cc
|
| +++ b/cc/animation/layer_animation_controller.cc
|
| @@ -924,7 +924,8 @@ void LayerAnimationController::NotifyObserversOpacityAnimated(
|
| value_observers_);
|
| LayerAnimationValueObserver* obs;
|
| while ((obs = it.GetNext()) != NULL) {
|
| - if ((notify_active_observers && obs->IsActive()) ||
|
| + if ((notify_active_observers && notify_pending_observers) ||
|
| + (notify_active_observers && obs->IsActive()) ||
|
| (notify_pending_observers && !obs->IsActive()))
|
| obs->OnOpacityAnimated(opacity);
|
| }
|
| @@ -940,7 +941,8 @@ void LayerAnimationController::NotifyObserversTransformAnimated(
|
| value_observers_);
|
| LayerAnimationValueObserver* obs;
|
| while ((obs = it.GetNext()) != NULL) {
|
| - if ((notify_active_observers && obs->IsActive()) ||
|
| + if ((notify_active_observers && notify_pending_observers) ||
|
| + (notify_active_observers && obs->IsActive()) ||
|
| (notify_pending_observers && !obs->IsActive()))
|
| obs->OnTransformAnimated(transform);
|
| }
|
| @@ -956,7 +958,8 @@ void LayerAnimationController::NotifyObserversFilterAnimated(
|
| value_observers_);
|
| LayerAnimationValueObserver* obs;
|
| while ((obs = it.GetNext()) != NULL) {
|
| - if ((notify_active_observers && obs->IsActive()) ||
|
| + if ((notify_active_observers && notify_pending_observers) ||
|
| + (notify_active_observers && obs->IsActive()) ||
|
| (notify_pending_observers && !obs->IsActive()))
|
| obs->OnFilterAnimated(filters);
|
| }
|
| @@ -972,7 +975,8 @@ void LayerAnimationController::NotifyObserversScrollOffsetAnimated(
|
| value_observers_);
|
| LayerAnimationValueObserver* obs;
|
| while ((obs = it.GetNext()) != NULL) {
|
| - if ((notify_active_observers && obs->IsActive()) ||
|
| + if ((notify_active_observers && notify_pending_observers) ||
|
| + (notify_active_observers && obs->IsActive()) ||
|
| (notify_pending_observers && !obs->IsActive()))
|
| obs->OnScrollOffsetAnimated(scroll_offset);
|
| }
|
|
|