OLD | NEW |
---|---|
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CC_LAYERS_LAYER_H_ | 5 #ifndef CC_LAYERS_LAYER_H_ |
6 #define CC_LAYERS_LAYER_H_ | 6 #define CC_LAYERS_LAYER_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
261 } | 261 } |
262 RenderSurface* render_surface() const { | 262 RenderSurface* render_surface() const { |
263 return draw_properties_.render_surface.get(); | 263 return draw_properties_.render_surface.get(); |
264 } | 264 } |
265 int num_unclipped_descendants() const { | 265 int num_unclipped_descendants() const { |
266 return draw_properties_.num_unclipped_descendants; | 266 return draw_properties_.num_unclipped_descendants; |
267 } | 267 } |
268 | 268 |
269 void SetScrollOffset(gfx::Vector2d scroll_offset); | 269 void SetScrollOffset(gfx::Vector2d scroll_offset); |
270 gfx::Vector2d scroll_offset() const { return scroll_offset_; } | 270 gfx::Vector2d scroll_offset() const { return scroll_offset_; } |
271 gfx::Vector2d BlinkScrollOffset() const; | |
271 void SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset); | 272 void SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset); |
272 | 273 |
273 void SetMaxScrollOffset(gfx::Vector2d max_scroll_offset); | 274 gfx::Vector2d MaxScrollOffset() const; |
274 gfx::Vector2d max_scroll_offset() const { return max_scroll_offset_; } | |
275 | 275 |
276 void SetScrollable(bool scrollable); | 276 void SetScrollClipLayer(Layer* clip_layer); |
277 bool scrollable() const { return scrollable_; } | 277 bool scrollable() const { return clip_layer_; } |
278 | 278 |
279 void SetUserScrollable(bool horizontal, bool vertical); | 279 void SetUserScrollable(bool horizontal, bool vertical); |
280 bool user_scrollable_horizontal() const { | 280 bool user_scrollable_horizontal() const { |
281 return user_scrollable_horizontal_; | 281 return user_scrollable_horizontal_; |
282 } | 282 } |
283 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } | 283 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } |
284 | 284 |
285 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread); | 285 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread); |
286 bool should_scroll_on_main_thread() const { | 286 bool should_scroll_on_main_thread() const { |
287 return should_scroll_on_main_thread_; | 287 return should_scroll_on_main_thread_; |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
565 // This pointer value is nil when a Layer is not in a tree and is | 565 // This pointer value is nil when a Layer is not in a tree and is |
566 // updated via SetLayerTreeHost() if a layer moves between trees. | 566 // updated via SetLayerTreeHost() if a layer moves between trees. |
567 LayerTreeHost* layer_tree_host_; | 567 LayerTreeHost* layer_tree_host_; |
568 | 568 |
569 scoped_refptr<LayerAnimationController> layer_animation_controller_; | 569 scoped_refptr<LayerAnimationController> layer_animation_controller_; |
570 | 570 |
571 // Layer properties. | 571 // Layer properties. |
572 gfx::Size bounds_; | 572 gfx::Size bounds_; |
573 | 573 |
574 gfx::Vector2d scroll_offset_; | 574 gfx::Vector2d scroll_offset_; |
575 gfx::Vector2d max_scroll_offset_; | 575 Layer* clip_layer_; |
enne (OOO)
2014/01/02 19:28:17
Sorry for all the naming quibbles, but could you c
wjmaclean
2014/01/03 21:57:12
No problem, done. I've renamed the corresponding v
| |
576 bool scrollable_ : 1; | 576 bool scrollable_ : 1; |
577 bool should_scroll_on_main_thread_ : 1; | 577 bool should_scroll_on_main_thread_ : 1; |
578 bool have_wheel_event_handlers_ : 1; | 578 bool have_wheel_event_handlers_ : 1; |
579 bool user_scrollable_horizontal_ : 1; | 579 bool user_scrollable_horizontal_ : 1; |
580 bool user_scrollable_vertical_ : 1; | 580 bool user_scrollable_vertical_ : 1; |
581 bool is_root_for_isolated_group_ : 1; | 581 bool is_root_for_isolated_group_ : 1; |
582 bool is_container_for_fixed_position_layers_ : 1; | 582 bool is_container_for_fixed_position_layers_ : 1; |
583 bool is_drawable_ : 1; | 583 bool is_drawable_ : 1; |
584 bool hide_layer_and_subtree_ : 1; | 584 bool hide_layer_and_subtree_ : 1; |
585 bool masks_to_bounds_ : 1; | 585 bool masks_to_bounds_ : 1; |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
625 DrawProperties<Layer> draw_properties_; | 625 DrawProperties<Layer> draw_properties_; |
626 | 626 |
627 PaintProperties paint_properties_; | 627 PaintProperties paint_properties_; |
628 | 628 |
629 DISALLOW_COPY_AND_ASSIGN(Layer); | 629 DISALLOW_COPY_AND_ASSIGN(Layer); |
630 }; | 630 }; |
631 | 631 |
632 } // namespace cc | 632 } // namespace cc |
633 | 633 |
634 #endif // CC_LAYERS_LAYER_H_ | 634 #endif // CC_LAYERS_LAYER_H_ |
OLD | NEW |