| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 056326b8c0a266f0e4360c501f320d7762e94629..b13be32f7becfff292241c7d68ed2f42e0c8e72a 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -20,7 +20,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| -#include "cc/animation/animation.h"
|
| +#include "cc/animation/target_property.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/debug/frame_timing_tracker.h"
|
| #include "cc/debug/micro_benchmark.h"
|
| @@ -295,9 +295,6 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| TaskRunnerProvider* task_runner_provider() const {
|
| return task_runner_provider_.get();
|
| }
|
| - AnimationRegistrar* animation_registrar() const {
|
| - return animation_registrar_.get();
|
| - }
|
| AnimationHost* animation_host() const { return animation_host_.get(); }
|
|
|
| bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
|
| @@ -550,7 +547,6 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| EventListenerProperties event_listener_properties_[static_cast<size_t>(
|
| EventListenerClass::kNumClasses)];
|
|
|
| - scoped_ptr<AnimationRegistrar> animation_registrar_;
|
| scoped_ptr<AnimationHost> animation_host_;
|
|
|
| scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
|
|
|