| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index db472c6aa3eda140e40f282358b791769c877ef0..a4b63c9678aec7498aeea71939f180aefacdac2a 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -25,6 +25,7 @@
|
| #include "cc/layers/layer_position_constraint.h"
|
| #include "cc/layers/paint_properties.h"
|
| #include "cc/layers/render_surface.h"
|
| +#include "cc/layers/scroll_blocks_on.h"
|
| #include "cc/output/filter_operations.h"
|
| #include "cc/trees/property_tree.h"
|
| #include "skia/ext/refptr.h"
|
| @@ -305,6 +306,9 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| return touch_event_handler_region_;
|
| }
|
|
|
| + void SetScrollBlocksOn(ScrollBlocksOn scroll_blocks_on);
|
| + ScrollBlocksOn scroll_blocks_on() const { return scroll_blocks_on_; }
|
| +
|
| void set_did_scroll_callback(const base::Closure& callback) {
|
| did_scroll_callback_ = callback;
|
| }
|
| @@ -667,6 +671,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| bool force_render_surface_ : 1;
|
| bool transform_is_invertible_ : 1;
|
| bool has_render_surface_ : 1;
|
| + ScrollBlocksOn scroll_blocks_on_ : 3;
|
| Region non_fast_scrollable_region_;
|
| Region touch_event_handler_region_;
|
| gfx::PointF position_;
|
|
|