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

Unified Diff: cc/layer_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
« cc/layer.h ('K') | « cc/layer.cc ('k') | cc/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 1624a6cb96938427ce4f66947a4ce5bba7a44fd7..89827af439dff290937819b3465097cb2491f3c0 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -34,6 +34,7 @@ class DictionaryValue;
namespace cc {
class LayerTreeHostImpl;
+class LayerTreeImpl;
class QuadSink;
class Renderer;
class ScrollbarAnimationController;
@@ -46,9 +47,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationControllerClient {
public:
typedef ScopedPtrVector<LayerImpl> LayerList;
- static scoped_ptr<LayerImpl> create(LayerTreeHostImpl* hostImpl, int id)
+ static scoped_ptr<LayerImpl> create(LayerTreeImpl* treeImpl, int id)
{
- return make_scoped_ptr(new LayerImpl(hostImpl, id));
+ return make_scoped_ptr(new LayerImpl(treeImpl, id));
}
virtual ~LayerImpl();
@@ -80,7 +81,8 @@ public:
bool hasReplica() const { return m_replicaLayer; }
bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_replicaLayer->m_maskLayer); }
- LayerTreeHostImpl* layerTreeHostImpl() const { return m_layerTreeHostImpl; }
+ LayerTreeImpl* layerTreeImpl() const { return m_layerTreeImpl; }
+ LayerTreeHostImpl* layerTreeHostImpl() const;
scoped_ptr<SharedQuadState> createSharedQuadState() const;
// willDraw must be called before appendQuads. If willDraw is called,
@@ -286,7 +288,7 @@ public:
gfx::Rect layerRectToContentRect(const gfx::RectF& layerRect) const;
protected:
- LayerImpl(LayerTreeHostImpl* hostImpl, int);
+ LayerImpl(LayerTreeImpl* layerImpl, int);
// Get the color and size of the layer's debug border.
virtual void getDebugBorderProperties(SkColor*, float* width) const;
@@ -321,7 +323,7 @@ private:
int m_replicaLayerId; // ditto
scoped_ptr<LayerImpl> m_replicaLayer;
int m_layerId;
- LayerTreeHostImpl* m_layerTreeHostImpl;
+ LayerTreeImpl* m_layerTreeImpl;
// Properties synchronized from the associated Layer.
gfx::PointF m_anchorPoint;
« cc/layer.h ('K') | « cc/layer.cc ('k') | cc/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698