| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 } | 260 } |
| 261 RenderSurface* render_surface() const { | 261 RenderSurface* render_surface() const { |
| 262 return draw_properties_.render_surface.get(); | 262 return draw_properties_.render_surface.get(); |
| 263 } | 263 } |
| 264 int num_unclipped_descendants() const { | 264 int num_unclipped_descendants() const { |
| 265 return draw_properties_.num_unclipped_descendants; | 265 return draw_properties_.num_unclipped_descendants; |
| 266 } | 266 } |
| 267 | 267 |
| 268 void SetScrollOffset(gfx::Vector2d scroll_offset); | 268 void SetScrollOffset(gfx::Vector2d scroll_offset); |
| 269 gfx::Vector2d scroll_offset() const { return scroll_offset_; } | 269 gfx::Vector2d scroll_offset() const { return scroll_offset_; } |
| 270 void SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset); | 270 void SetScrollOffsetFromImplSide(const gfx::Vector2d& scroll_offset); |
| 271 | 271 |
| 272 gfx::Vector2d MaxScrollOffset() const; | 272 gfx::Vector2d MaxScrollOffset() const; |
| 273 | |
| 274 void SetScrollClipLayerId(int clip_layer_id); | 273 void SetScrollClipLayerId(int clip_layer_id); |
| 275 bool scrollable() const { return scroll_clip_layer_id_ != INVALID_ID; } | 274 bool scrollable() const { return scroll_clip_layer_id_ != INVALID_ID; } |
| 276 | 275 |
| 277 void SetUserScrollable(bool horizontal, bool vertical); | 276 void SetUserScrollable(bool horizontal, bool vertical); |
| 278 bool user_scrollable_horizontal() const { | 277 bool user_scrollable_horizontal() const { |
| 279 return user_scrollable_horizontal_; | 278 return user_scrollable_horizontal_; |
| 280 } | 279 } |
| 281 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } | 280 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } |
| 282 | 281 |
| 283 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread); | 282 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread); |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 DrawProperties<Layer> draw_properties_; | 618 DrawProperties<Layer> draw_properties_; |
| 620 | 619 |
| 621 PaintProperties paint_properties_; | 620 PaintProperties paint_properties_; |
| 622 | 621 |
| 623 DISALLOW_COPY_AND_ASSIGN(Layer); | 622 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 624 }; | 623 }; |
| 625 | 624 |
| 626 } // namespace cc | 625 } // namespace cc |
| 627 | 626 |
| 628 #endif // CC_LAYERS_LAYER_H_ | 627 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |