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

Unified Diff: cc/layer_tree_impl.h

Issue 11519018: [cc] Make LayerImpls point at LayerTreeImpl instead of LTHI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
Index: cc/layer_tree_impl.h
diff --git a/cc/layer_tree_impl.h b/cc/layer_tree_impl.h
index 95d53f88e6d596ac6a26b2548e88320ef5b32794..775b5ec9ee0c00568618bbff2d2daec5a785e86f 100644
--- a/cc/layer_tree_impl.h
+++ b/cc/layer_tree_impl.h
@@ -13,22 +13,21 @@ class LayerTreeHostImpl;
class LayerTreeImpl;
class HeadsUpDisplayLayerImpl;
-class CC_EXPORT LayerTreeImplClient {
- public:
- virtual void OnCanDrawStateChangedForTree(LayerTreeImpl*) = 0;
-
- protected:
- virtual ~LayerTreeImplClient() {}
-};
-
class CC_EXPORT LayerTreeImpl {
public:
- static scoped_ptr<LayerTreeImpl> create(LayerTreeImplClient* client)
+ static scoped_ptr<LayerTreeImpl> create(LayerTreeHostImpl* layer_tree_host_impl)
{
- return make_scoped_ptr(new LayerTreeImpl(client));
+ return make_scoped_ptr(new LayerTreeImpl(layer_tree_host_impl));
}
virtual ~LayerTreeImpl();
+ // Methods called by the layer tree.
+ // ---------------------------------------------------------------------------
+ // TODO(nduca): Remove this and have layers call through this class.
+ LayerTreeHostImpl* layer_tree_host_impl() const { return layer_tree_host_impl_; }
+
+ // Other public methods
+ // ---------------------------------------------------------------------------
LayerImpl* RootLayer() const { return root_layer_.get(); }
void SetRootLayer(scoped_ptr<LayerImpl>);
scoped_ptr<LayerImpl> DetachLayerTree();
@@ -48,9 +47,9 @@ class CC_EXPORT LayerTreeImpl {
void ClearCurrentlyScrollingLayer();
protected:
- LayerTreeImpl(LayerTreeImplClient* client);
+ LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl);
- LayerTreeImplClient* client_;
+ LayerTreeHostImpl* layer_tree_host_impl_;
int source_frame_number_;
scoped_ptr<LayerImpl> root_layer_;
HeadsUpDisplayLayerImpl* hud_layer_;
« cc/layer.h ('K') | « cc/layer_tree_host_unittest.cc ('k') | cc/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698