summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_impl.h
diff options
context:
space:
mode:
authorvollick <vollick@chromium.org>2016-03-01 15:44:10 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-01 23:45:35 +0000
commitcb3f6b13ff8f814e10d67cc548a1cdde69b386db (patch)
treef868068adb84a8f59906ac650ae0943857a01589 /cc/trees/layer_tree_host_impl.h
parent2f30bc46e457d9d07312af7b79fbb160fb9c81c4 (diff)
downloadchromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.zip
chromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.tar.gz
chromium_src-cb3f6b13ff8f814e10d67cc548a1cdde69b386db.tar.bz2
Revert of Introduce LayerListImpl (patchset #11 id:200001 of https://codereview.chromium.org/1746603002/ )
Reason for revert: I'm going to try another, less code churny approach to the layer list refactor. Original issue's description: > Introduce LayerListImpl > > In this cl, the LayerTreeImpl constructs a LayerListImpl. > The idea being that most plumbing won't need to change at > first to get the list to where it needs to be. The first > consumer of the LayerTreeImpl that I'm attempting to > teach to speak LayerListImpl-ese is the LayerImpl. That > has not been completely finished in this cl so that it > doesn't become too big and difficult to review. > > NB: since the actual storage of the LayerImpls doesn't > change in this cl (they're still in the LayerTreeImpl), > there's no need to guard this work behind a flag. > > BUG=557194 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/299bf1f63b8253c77530b904874f3435f9bde6d3 > Cr-Commit-Position: refs/heads/master@{#378398} TBR=weiliangc@chromium.org,ajuma@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=557194 Review URL: https://codereview.chromium.org/1751243002 Cr-Commit-Position: refs/heads/master@{#378608}
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
-rw-r--r--cc/trees/layer_tree_host_impl.h22
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_