| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index 7c0697d25cb7ad36e01f225902cab4787f8b515c..f38555a3a5ae9aafed5334bb268813051534b3e8 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -129,6 +129,9 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| void SetBounds(const gfx::Size& bounds);
|
| gfx::Size bounds() const { return bounds_; }
|
|
|
| + // This function is for property tree builder
|
| + gfx::Vector2dF bounds_delta() const { return gfx::Vector2dF(); }
|
| +
|
| void SetMasksToBounds(bool masks_to_bounds);
|
| bool masks_to_bounds() const { return masks_to_bounds_; }
|
|
|
| @@ -271,6 +274,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
|
|
| void SetScrollClipLayerId(int clip_layer_id);
|
| bool scrollable() const { return scroll_clip_layer_id_ != INVALID_ID; }
|
| + Layer* scroll_clip_layer() const;
|
| + int scroll_clip_layer_id() const { return scroll_clip_layer_id_; }
|
|
|
| void SetUserScrollable(bool horizontal, bool vertical);
|
| bool user_scrollable_horizontal() const {
|
|
|