Chromium Code Reviews| Index: cc/layers/layer.h |
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h |
| index 3ff2810c9d630f30d7b24ca0b75f66a28a906f6c..af79ab569824ba5f0227e2fb680276d728ae83a1 100644 |
| --- a/cc/layers/layer.h |
| +++ b/cc/layers/layer.h |
| @@ -252,7 +252,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
| bool screen_space_opacity_is_animating() const { |
| return draw_properties_.screen_space_opacity_is_animating; |
| } |
| - bool is_clipped() const { return draw_properties_.is_clipped; } |
| gfx::Rect clip_rect() const { return draw_properties_.clip_rect; } |
| gfx::Rect drawable_content_rect() const { |
| return draw_properties_.drawable_content_rect; |
| @@ -500,6 +499,16 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
| return should_flatten_transform_from_property_tree_; |
| } |
| + void set_is_clipped_from_property_tree(bool is_clipped) { |
| + if (is_clipped_from_property_tree_ == is_clipped) |
| + return; |
| + is_clipped_from_property_tree_ = is_clipped; |
| + SetNeedsPushProperties(); |
| + } |
| + bool is_clipped_from_property_tree() const { |
|
Ian Vollick
2015/07/09 14:26:27
the "from_property_tree" suffix is only used to di
jaydasika
2015/07/09 15:11:49
Done.
|
| + return is_clipped_from_property_tree_; |
| + } |
| + |
| // TODO(vollick): These values are temporary and will be removed as soon as |
| // render surface determinations are moved out of CDP. They only exist because |
| // certain logic depends on whether or not a layer would render to a separate |
| @@ -698,6 +707,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
| int num_children_with_scroll_parent_; |
| gfx::Vector2dF offset_to_transform_parent_; |
| bool should_flatten_transform_from_property_tree_ : 1; |
| + bool is_clipped_from_property_tree_ : 1; |
| bool should_scroll_on_main_thread_ : 1; |
| bool have_wheel_event_handlers_ : 1; |
| bool have_scroll_event_handlers_ : 1; |