Index: cc/layer_impl.h |
diff --git a/cc/layer_impl.h b/cc/layer_impl.h |
index 3d7ab85095edf5aa9f9e8e5413222405ae7ac75c..4482659e379e259b053df8e88b5cf0d5c51c2904 100644 |
--- a/cc/layer_impl.h |
+++ b/cc/layer_impl.h |
@@ -43,7 +43,7 @@ class Layer; |
struct AppendQuadsData; |
-class CC_EXPORT LayerImpl : public LayerAnimationControllerClient { |
+class CC_EXPORT LayerImpl : LayerAnimationControllerObserver { |
public: |
typedef ScopedPtrVector<LayerImpl> LayerList; |
@@ -54,12 +54,11 @@ public: |
virtual ~LayerImpl(); |
- // LayerAnimationControllerClient implementation. |
- virtual int id() const OVERRIDE; |
- virtual void setOpacityFromAnimation(float) OVERRIDE; |
- virtual float opacity() const OVERRIDE; |
- virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE; |
- virtual const gfx::Transform& transform() const OVERRIDE; |
+ int id() const; |
+ |
+ // LayerAnimationControllerObserver implementation. |
+ virtual void OnOpacityAnimated(float) OVERRIDE; |
+ virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; |
// Tree structure. |
LayerImpl* parent() { return m_parent; } |
@@ -131,6 +130,7 @@ public: |
bool contentsOpaque() const { return m_contentsOpaque; } |
void setOpacity(float); |
+ float opacity() const; |
bool opacityIsAnimating() const; |
void setPosition(const gfx::PointF&); |
@@ -239,6 +239,7 @@ public: |
void setDoubleSided(bool); |
void setTransform(const gfx::Transform&); |
+ const gfx::Transform& transform() const; |
bool transformIsAnimating() const; |
const gfx::RectF& updateRect() const { return m_updateRect; } |
@@ -388,7 +389,7 @@ private: |
gfx::RectF m_updateRect; |
// Manages animations for this layer. |
- scoped_ptr<LayerAnimationController> m_layerAnimationController; |
+ scoped_refptr<LayerAnimationController> m_layerAnimationController; |
// Manages scrollbars for this layer |
scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController; |