Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3200)

Unified Diff: cc/trees/layer_tree.h

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree.h
diff --git a/cc/trees/layer_tree.h b/cc/trees/layer_tree.h
index 08bb31b3811c0dc6b194e44cd18626af0e04c01c..6dbc0a7c799d7c6f8395c07c54bc4083c986bd16 100644
--- a/cc/trees/layer_tree.h
+++ b/cc/trees/layer_tree.h
@@ -33,7 +33,6 @@ class LayerTree;
class LayerUpdate;
} // namespace proto
-class AnimationHost;
class ClientPictureCache;
class EnginePictureCache;
class HeadsUpDisplayLayer;
@@ -41,6 +40,7 @@ class Layer;
class LayerTreeHost;
class LayerTreeImpl;
class LayerTreeSettings;
+class MutatorHost;
struct PendingPageScaleAnimation;
class UIResourceManager;
class SwapPromiseManager;
@@ -51,8 +51,7 @@ class CC_EXPORT LayerTree : public MutatorHostClient {
using LayerSet = std::unordered_set<Layer*>;
using LayerIdMap = std::unordered_map<int, Layer*>;
- LayerTree(std::unique_ptr<AnimationHost> animation_host,
- LayerTreeHost* layer_tree_host);
+ LayerTree(MutatorHost* mutator_host, LayerTreeHost* layer_tree_host);
virtual ~LayerTree();
void SetRootLayer(scoped_refptr<Layer> root_layer);
@@ -189,7 +188,7 @@ class CC_EXPORT LayerTree : public MutatorHostClient {
void ToProtobuf(proto::LayerTree* proto, bool inputs_only);
void FromProtobuf(const proto::LayerTree& proto);
- AnimationHost* animation_host() const { return animation_host_.get(); }
+ MutatorHost* mutator_host() const { return mutator_host_; }
Layer* LayerByElementId(ElementId element_id) const;
void RegisterElement(ElementId element_id,
@@ -301,7 +300,7 @@ class CC_EXPORT LayerTree : public MutatorHostClient {
bool in_paint_layer_contents_;
- std::unique_ptr<AnimationHost> animation_host_;
+ MutatorHost* mutator_host_;
LayerTreeHost* layer_tree_host_;
// TODO(khushalsagar): Make these go away once we transition blimp to an
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698