Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index dfb40941e263e8c96815212365c577d8e74e98f4..51ae3d7b2d10a16268c0c567dfed9dbc28f05137 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -41,6 +41,7 @@ struct hash<WebKit::WebGraphicsContext3D*> { |
namespace cc { |
+class AnimationRegistrar; |
class Layer; |
class LayerTreeHostImpl; |
class LayerTreeHostImplClient; |
@@ -146,7 +147,6 @@ public: |
bool commitRequested() const; |
void setAnimationEvents(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime); |
- virtual void didAddAnimation(); |
Layer* rootLayer() { return m_rootLayer.get(); } |
const Layer* rootLayer() const { return m_rootLayer.get(); } |
@@ -199,6 +199,8 @@ public: |
Proxy* proxy() const { return m_proxy.get(); } |
+ AnimationRegistrar* animationRegistrar() const { return m_animationRegistrar.get(); } |
+ |
protected: |
LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&); |
bool initialize(scoped_ptr<Thread> implThread); |
@@ -227,7 +229,6 @@ private: |
void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime); |
bool m_animating; |
- bool m_needsAnimateLayers; |
bool m_needsFullTreeSync; |
base::CancelableClosure m_prepaintCallback; |
@@ -272,6 +273,8 @@ private: |
typedef ScopedPtrVector<PrioritizedResource> TextureList; |
size_t m_partialTextureUpdateRequests; |
+ scoped_ptr<AnimationRegistrar> m_animationRegistrar; |
+ |
static bool s_needsFilterContext; |
DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); |