| Index: cc/layer_impl.h
|
| diff --git a/cc/layer_impl.h b/cc/layer_impl.h
|
| index b92862eb7e71981ed390f858c3706deb1ff5452f..43d73eaee3d2ab39d64e7bf2494557b660ace013 100644
|
| --- a/cc/layer_impl.h
|
| +++ b/cc/layer_impl.h
|
| @@ -42,9 +42,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationControllerClient {
|
| public:
|
| typedef ScopedPtrVector<LayerImpl> LayerList;
|
|
|
| - static scoped_ptr<LayerImpl> create(int id)
|
| + static scoped_ptr<LayerImpl> create(LayerTreeHostImpl* hostImpl, int id)
|
| {
|
| - return make_scoped_ptr(new LayerImpl(id));
|
| + return make_scoped_ptr(new LayerImpl(hostImpl, id));
|
| }
|
|
|
| virtual ~LayerImpl();
|
| @@ -77,7 +77,6 @@ public:
|
| bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_replicaLayer->m_maskLayer); }
|
|
|
| LayerTreeHostImpl* layerTreeHostImpl() const { return m_layerTreeHostImpl; }
|
| - void setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl) { m_layerTreeHostImpl = hostImpl; }
|
|
|
| scoped_ptr<SharedQuadState> createSharedQuadState() const;
|
| // willDraw must be called before appendQuads. If willDraw is called,
|
| @@ -279,7 +278,7 @@ public:
|
| gfx::Rect layerRectToContentRect(const gfx::RectF& layerRect) const;
|
|
|
| protected:
|
| - explicit LayerImpl(int);
|
| + LayerImpl(LayerTreeHostImpl* hostImpl, int);
|
|
|
| // Get the color and size of the layer's debug border.
|
| virtual void getDebugBorderProperties(SkColor*, float* width) const;
|
|
|