| Index: cc/layer_impl.h
|
| diff --git a/cc/layer_impl.h b/cc/layer_impl.h
|
| index 1dd36bb50f7ae3dad8ed062745170200351770b0..fd1a6cf3677fde3cc602572b49ff3b5b1a8152e4 100644
|
| --- a/cc/layer_impl.h
|
| +++ b/cc/layer_impl.h
|
| @@ -38,6 +38,8 @@ struct AppendQuadsData;
|
|
|
| class CC_EXPORT LayerImpl : public LayerAnimationControllerClient {
|
| public:
|
| + typedef ScopedPtrVector<LayerImpl> LayerList;
|
| +
|
| static scoped_ptr<LayerImpl> create(int id)
|
| {
|
| return make_scoped_ptr(new LayerImpl(id));
|
| @@ -55,7 +57,7 @@ public:
|
| // Tree structure.
|
| LayerImpl* parent() { return m_parent; }
|
| const LayerImpl* parent() const { return m_parent; }
|
| - const ScopedPtrVector<LayerImpl>& children() const { return m_children; }
|
| + const LayerList& children() const { return m_children; }
|
| void addChild(scoped_ptr<LayerImpl>);
|
| void removeFromParent();
|
| void removeAllChildren();
|
| @@ -97,9 +99,6 @@ public:
|
| bool forceRenderSurface() const { return m_forceRenderSurface; }
|
| void setForceRenderSurface(bool force) { m_forceRenderSurface = force; }
|
|
|
| - // Returns true if any of the layer's descendants has content to draw.
|
| - virtual bool descendantDrawsContent();
|
| -
|
| void setAnchorPoint(const gfx::PointF&);
|
| const gfx::PointF& anchorPoint() const { return m_anchorPoint; }
|
|
|
| @@ -312,7 +311,7 @@ private:
|
|
|
| // Properties internal to LayerImpl
|
| LayerImpl* m_parent;
|
| - ScopedPtrVector<LayerImpl> m_children;
|
| + LayerList m_children;
|
| // m_maskLayer can be temporarily stolen during tree sync, we need this ID to confirm newly assigned layer is still the previous one
|
| int m_maskLayerId;
|
| scoped_ptr<LayerImpl> m_maskLayer;
|
|
|