| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index 61ef3f8c3ac701b0b89f87fc74886a2189665774..3452e8b157b6b63477b20ff69b27deca5f8ee018 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -504,14 +504,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
|
|
| bool IsPropertyChangeAllowed() const;
|
|
|
| - // If this layer has a scroll parent, it removes |this| from its list of
|
| - // scroll children.
|
| - void RemoveFromScrollTree();
|
| -
|
| - // If this layer has a clip parent, it removes |this| from its list of clip
|
| - // children.
|
| - void RemoveFromClipTree();
|
| -
|
| void reset_raster_scale_to_unknown() { raster_scale_ = 0.f; }
|
|
|
| // This flag is set when the layer needs to push properties to the impl
|
| @@ -571,6 +563,14 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| virtual void OnAnimationWaitingForDeletion() OVERRIDE;
|
| virtual bool IsActive() const OVERRIDE;
|
|
|
| + // If this layer has a scroll parent, it removes |this| from its list of
|
| + // scroll children.
|
| + void RemoveFromScrollTree();
|
| +
|
| + // If this layer has a clip parent, it removes |this| from its list of clip
|
| + // children.
|
| + void RemoveFromClipTree();
|
| +
|
| LayerList children_;
|
| Layer* parent_;
|
|
|
|
|