summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host.h
diff options
context:
space:
mode:
authorloyso <loyso@chromium.org>2016-03-10 23:54:58 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-11 07:56:32 +0000
commit9556c73c3d89db2226920a295e3a579dc6a1eaa3 (patch)
tree305701d312ce0b6c6d7c237bdfaedefed4163401 /cc/trees/layer_tree_host.h
parentecae0ae5f672a04579ab563462531889f6c0fab9 (diff)
downloadchromium_src-9556c73c3d89db2226920a295e3a579dc6a1eaa3.zip
chromium_src-9556c73c3d89db2226920a295e3a579dc6a1eaa3.tar.gz
chromium_src-9556c73c3d89db2226920a295e3a579dc6a1eaa3.tar.bz2
CC Animation: Erase old animation system.
Basically, specialize all the code as if: - use_compositor_animation_timelines is always true. - Layer::layer_animation_controller_ is always nullptr. - LayerImpl::layer_animation_controller_ is always nullptr. - LayerTreeHost::animation_registrar_ is always nullptr. - LayerTreeHostImpl::animation_registrar_ is always nullptr. Next CL: Erase cc::LayerSettings everywhere. BUG=575041 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1782433002 Cr-Commit-Position: refs/heads/master@{#380576}
Diffstat (limited to 'cc/trees/layer_tree_host.h')
-rw-r--r--cc/trees/layer_tree_host.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 056326b..b13be32 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_;