| Index: cc/animation/layer_animation_controller.cc
|
| diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
|
| index c722dc59af2bb56d92c640f4e6ed505b0efb9457..21a88508e346a3c4a6780ba223b1f080bfe22f53 100644
|
| --- a/cc/animation/layer_animation_controller.cc
|
| +++ b/cc/animation/layer_animation_controller.cc
|
| @@ -28,7 +28,6 @@ LayerAnimationController::LayerAnimationController(int id)
|
| : host_(0),
|
| id_(id),
|
| is_active_(false),
|
| - event_observer_(nullptr),
|
| value_observer_(nullptr),
|
| value_provider_(nullptr),
|
| layer_animation_delegate_(nullptr),
|
| @@ -391,8 +390,6 @@ void LayerAnimationController::SetAnimationHost(AnimationHost* host) {
|
| void LayerAnimationController::NotifyAnimationStarted(
|
| const AnimationEvent& event) {
|
| if (event.is_impl_only) {
|
| - if (event_observer_)
|
| - event_observer_->OnAnimationStarted(event);
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationStarted(
|
| event.monotonic_time, event.target_property, event.group_id);
|
| @@ -407,8 +404,6 @@ void LayerAnimationController::NotifyAnimationStarted(
|
| if (!animations_[i]->has_set_start_time())
|
| animations_[i]->set_start_time(event.monotonic_time);
|
|
|
| - if (event_observer_)
|
| - event_observer_->OnAnimationStarted(event);
|
| if (layer_animation_delegate_)
|
| layer_animation_delegate_->NotifyAnimationStarted(
|
| event.monotonic_time, event.target_property, event.group_id);
|
| @@ -489,11 +484,6 @@ void LayerAnimationController::NotifyAnimationPropertyUpdate(
|
| }
|
| }
|
|
|
| -void LayerAnimationController::SetEventObserver(
|
| - LayerAnimationEventObserver* observer) {
|
| - event_observer_ = observer;
|
| -}
|
| -
|
| bool LayerAnimationController::HasFilterAnimationThatInflatesBounds() const {
|
| for (size_t i = 0; i < animations_.size(); ++i) {
|
| if (!animations_[i]->is_finished() &&
|
|
|