| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index 59991e65fff846f98cbf9ad4817acb692d5b1880..f0bca17f47c4b50885199d8baba41b2578ce0b16 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -573,11 +573,22 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
|
|
| gfx::Vector2d scroll_offset_;
|
| gfx::Vector2d max_scroll_offset_;
|
| - bool scrollable_;
|
| - bool should_scroll_on_main_thread_;
|
| - bool have_wheel_event_handlers_;
|
| - bool user_scrollable_horizontal_;
|
| - bool user_scrollable_vertical_;
|
| + bool scrollable_ : 1;
|
| + bool should_scroll_on_main_thread_ : 1;
|
| + bool have_wheel_event_handlers_ : 1;
|
| + bool user_scrollable_horizontal_ : 1;
|
| + bool user_scrollable_vertical_ : 1;
|
| + bool is_root_for_isolated_group_ : 1;
|
| + bool is_container_for_fixed_position_layers_ : 1;
|
| + bool is_drawable_ : 1;
|
| + bool hide_layer_and_subtree_ : 1;
|
| + bool masks_to_bounds_ : 1;
|
| + bool contents_opaque_ : 1;
|
| + bool double_sided_ : 1;
|
| + bool preserves_3d_ : 1;
|
| + bool use_parent_backface_visibility_ : 1;
|
| + bool draw_checkerboard_for_missing_tiles_ : 1;
|
| + bool force_render_surface_ : 1;
|
| Region non_fast_scrollable_region_;
|
| Region touch_event_handler_region_;
|
| gfx::PointF position_;
|
| @@ -586,21 +597,10 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| CompositingReasons compositing_reasons_;
|
| float opacity_;
|
| SkXfermode::Mode blend_mode_;
|
| - bool is_root_for_isolated_group_;
|
| FilterOperations filters_;
|
| FilterOperations background_filters_;
|
| float anchor_point_z_;
|
| - bool is_container_for_fixed_position_layers_;
|
| LayerPositionConstraint position_constraint_;
|
| - bool is_drawable_;
|
| - bool hide_layer_and_subtree_;
|
| - bool masks_to_bounds_;
|
| - bool contents_opaque_;
|
| - bool double_sided_;
|
| - bool preserves_3d_;
|
| - bool use_parent_backface_visibility_;
|
| - bool draw_checkerboard_for_missing_tiles_;
|
| - bool force_render_surface_;
|
| Layer* scroll_parent_;
|
| scoped_ptr<std::set<Layer*> > scroll_children_;
|
|
|
|
|