diff options
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index a2520fb..9c2e58e 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -257,24 +257,24 @@ class CC_EXPORT LayerTreeHostImpl bool AnimationsPreserveAxisAlignment(const LayerImpl* layer) const; // LayerTreeMutatorsClient implementation. - bool IsLayerInTree(int layer_id, LayerListType list_type) const override; + bool IsLayerInTree(int layer_id, LayerTreeType tree_type) const override; void SetMutatorsNeedCommit() override; void SetMutatorsNeedRebuildPropertyTrees() override; void SetLayerFilterMutated(int layer_id, - LayerListType list_type, + LayerTreeType tree_type, const FilterOperations& filters) override; void SetLayerOpacityMutated(int layer_id, - LayerListType list_type, + LayerTreeType tree_type, float opacity) override; void SetLayerTransformMutated(int layer_id, - LayerListType list_type, + LayerTreeType tree_type, const gfx::Transform& transform) override; void SetLayerScrollOffsetMutated( int layer_id, - LayerListType list_type, + LayerTreeType tree_type, const gfx::ScrollOffset& scroll_offset) override; void LayerTransformIsPotentiallyAnimatingChanged(int layer_id, - LayerListType list_type, + LayerTreeType tree_type, bool is_animating) override; void ScrollOffsetAnimationFinished() override; gfx::ScrollOffset GetScrollOffsetForAnimation(int layer_id) const override; @@ -409,14 +409,6 @@ class CC_EXPORT LayerTreeHostImpl virtual void DidFinishImplFrame(); void DidModifyTilePriorities(); - // TODO(vollick): we will retain both the _tree() and _list() accessors while - // we migrate to layer lists, but the plan is to eventually remove the _tree() - // ones. - LayerListImpl* active_list(); - const LayerListImpl* active_list() const; - LayerListImpl* pending_list(); - const LayerListImpl* pending_list() const; - LayerTreeImpl* active_tree() { return active_tree_.get(); } const LayerTreeImpl* active_tree() const { return active_tree_.get(); } LayerTreeImpl* pending_tree() { return pending_tree_.get(); } @@ -849,8 +841,6 @@ class CC_EXPORT LayerTreeHostImpl DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); }; -typedef LayerTreeHostImpl LayerListHostImpl; - } // namespace cc #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ |