| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index 5e29a1c5458786141971cd7ed359f05d8a0c0875..979d2e02c8c0a96ce4ce13b2de5a5c38f20ba5c3 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| +#include "cc/animation/animation_delegate.h"
|
| #include "cc/animation/layer_animation_controller.h"
|
| #include "cc/animation/layer_animation_value_observer.h"
|
| #include "cc/animation/layer_animation_value_provider.h"
|
| @@ -65,7 +66,8 @@ enum DrawMode {
|
| };
|
|
|
| class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| - public LayerAnimationValueProvider {
|
| + public LayerAnimationValueProvider,
|
| + public AnimationDelegate {
|
| public:
|
| // Allows for the ownership of the total scroll offset to be delegated outside
|
| // of the layer.
|
| @@ -102,6 +104,14 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| virtual void OnAnimationWaitingForDeletion() OVERRIDE;
|
| virtual bool IsActive() const OVERRIDE;
|
|
|
| + // AnimationDelegate implementation.
|
| + virtual void NotifyAnimationStarted(
|
| + base::TimeTicks monotonic_time,
|
| + Animation::TargetProperty target_property) OVERRIDE{};
|
| + virtual void NotifyAnimationFinished(
|
| + base::TimeTicks monotonic_time,
|
| + Animation::TargetProperty target_property) OVERRIDE;
|
| +
|
| // Tree structure.
|
| LayerImpl* parent() { return parent_; }
|
| const LayerImpl* parent() const { return parent_; }
|
|
|