| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index 84f7bf1ce625371944f008ac3aace53fce49c026..bd9db347484947fb6505148615c75f13bd25008f 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -35,6 +35,7 @@
|
| #include "cc/resources/tile_manager.h"
|
| #include "cc/scheduler/commit_earlyout_reason.h"
|
| #include "cc/scheduler/draw_result.h"
|
| +#include "cc/trees/layer_tree_mutators_client.h"
|
| #include "skia/ext/refptr.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -128,7 +129,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| public OutputSurfaceClient,
|
| public TopControlsManagerClient,
|
| public ScrollbarAnimationControllerClient,
|
| - public base::SupportsWeakPtr<LayerTreeHostImpl> {
|
| + public base::SupportsWeakPtr<LayerTreeHostImpl>,
|
| + public LayerTreeMutatorsClient {
|
| public:
|
| static scoped_ptr<LayerTreeHostImpl> Create(
|
| const LayerTreeSettings& settings,
|
| @@ -213,6 +215,33 @@ class CC_EXPORT LayerTreeHostImpl
|
| void DidAnimateScrollOffset();
|
| void SetViewportDamage(const gfx::Rect& damage_rect);
|
|
|
| + void SetAnimationTimeline(scoped_refptr<AnimationTimeline> timeline);
|
| +
|
| + void SetTreeLayerFilterMutated(int layer_id,
|
| + LayerTreeImpl* tree,
|
| + const FilterOperations& filters);
|
| + void SetTreeLayerOpacityMutated(int layer_id,
|
| + LayerTreeImpl* tree,
|
| + float opacity);
|
| + void SetTreeLayerTransformMutated(int layer_id,
|
| + LayerTreeImpl* tree,
|
| + const gfx::Transform& transform);
|
| +
|
| + // LayerTreeMutatorsClient implementation.
|
| + AnimationRegistrar* GetAnimationRegistrar() const override;
|
| + bool IsLayerInActiveTree(int layer_id) const override;
|
| + bool IsLayerInPendingTree(int layer_id) const override;
|
| + void SetMutatorsNeedCommit() override;
|
| + void SetLayerFilterMutated(int layer_id,
|
| + bool affects_active_tree,
|
| + const FilterOperations& filters) override;
|
| + void SetLayerOpacityMutated(int layer_id,
|
| + bool affects_active_tree,
|
| + float opacity) override;
|
| + void SetLayerTransformMutated(int layer_id,
|
| + bool affects_active_tree,
|
| + const gfx::Transform& transform) override;
|
| +
|
| virtual void PrepareTiles();
|
|
|
| // Returns DRAW_SUCCESS unless problems occured preparing the frame, and we
|
| @@ -415,6 +444,9 @@ class CC_EXPORT LayerTreeHostImpl
|
| AnimationRegistrar* animation_registrar() const {
|
| return animation_registrar_.get();
|
| }
|
| + AnimationTimeline* animation_timeline() const {
|
| + return animation_timeline_.get();
|
| + }
|
|
|
| void SetDebugState(const LayerTreeDebugState& new_debug_state);
|
| const LayerTreeDebugState& debug_state() const { return debug_state_; }
|
| @@ -718,6 +750,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| base::TimeDelta begin_impl_frame_interval_;
|
|
|
| scoped_ptr<AnimationRegistrar> animation_registrar_;
|
| + scoped_refptr<AnimationTimeline> animation_timeline_;
|
| std::set<ScrollbarAnimationController*> scrollbar_animation_controllers_;
|
|
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation_;
|
|
|