| Index: cc/layer.h
|
| diff --git a/cc/layer.h b/cc/layer.h
|
| index e7df4c08417438213d18838adcc177e5d440b765..51dc181baa35471f090803f12d89b1f5396c679e 100644
|
| --- a/cc/layer.h
|
| +++ b/cc/layer.h
|
| @@ -33,7 +33,7 @@ class WebLayerScrollClient;
|
|
|
| namespace cc {
|
|
|
| -class ActiveAnimation;
|
| +class Animation;
|
| struct AnimationEvent;
|
| class LayerAnimationDelegate;
|
| class LayerImpl;
|
| @@ -257,7 +257,7 @@ public:
|
| // Set the priority of all desired textures in this layer.
|
| virtual void setTexturePriorities(const PriorityCalculator&) { }
|
|
|
| - bool addAnimation(scoped_ptr<ActiveAnimation>);
|
| + bool addAnimation(scoped_ptr<Animation>);
|
| void pauseAnimation(int animationId, double timeOffset);
|
| void removeAnimation(int animationId);
|
|
|
|
|