| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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_IMPL_H_ | 5 #ifndef CC_LAYERS_LAYER_IMPL_H_ |
| 6 #define CC_LAYERS_LAYER_IMPL_H_ | 6 #define CC_LAYERS_LAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "cc/animation/animation_delegate.h" | 14 #include "cc/animation/animation_delegate.h" |
| 15 #include "cc/animation/layer_animation_controller.h" | 15 #include "cc/animation/layer_animation_controller.h" |
| 16 #include "cc/animation/layer_animation_value_observer.h" | 16 #include "cc/animation/layer_animation_value_observer.h" |
| 17 #include "cc/animation/layer_animation_value_provider.h" | 17 #include "cc/animation/layer_animation_value_provider.h" |
| 18 #include "cc/base/cc_export.h" | 18 #include "cc/base/cc_export.h" |
| 19 #include "cc/base/region.h" | 19 #include "cc/base/region.h" |
| 20 #include "cc/base/scoped_ptr_vector.h" | 20 #include "cc/base/scoped_ptr_vector.h" |
| 21 #include "cc/input/input_handler.h" | 21 #include "cc/input/input_handler.h" |
| 22 #include "cc/input/scrollbar.h" |
| 22 #include "cc/layers/draw_properties.h" | 23 #include "cc/layers/draw_properties.h" |
| 23 #include "cc/layers/layer_lists.h" | 24 #include "cc/layers/layer_lists.h" |
| 24 #include "cc/layers/layer_position_constraint.h" | 25 #include "cc/layers/layer_position_constraint.h" |
| 25 #include "cc/layers/render_surface_impl.h" | 26 #include "cc/layers/render_surface_impl.h" |
| 26 #include "cc/output/filter_operations.h" | 27 #include "cc/output/filter_operations.h" |
| 27 #include "cc/quads/shared_quad_state.h" | 28 #include "cc/quads/shared_quad_state.h" |
| 28 #include "cc/resources/resource_provider.h" | 29 #include "cc/resources/resource_provider.h" |
| 29 #include "skia/ext/refptr.h" | 30 #include "skia/ext/refptr.h" |
| 30 #include "third_party/skia/include/core/SkColor.h" | 31 #include "third_party/skia/include/core/SkColor.h" |
| 31 #include "third_party/skia/include/core/SkImageFilter.h" | 32 #include "third_party/skia/include/core/SkImageFilter.h" |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 user_scrollable_horizontal_ = scrollable; | 413 user_scrollable_horizontal_ = scrollable; |
| 413 } | 414 } |
| 414 bool user_scrollable_horizontal() const { | 415 bool user_scrollable_horizontal() const { |
| 415 return user_scrollable_horizontal_; | 416 return user_scrollable_horizontal_; |
| 416 } | 417 } |
| 417 void set_user_scrollable_vertical(bool scrollable) { | 418 void set_user_scrollable_vertical(bool scrollable) { |
| 418 user_scrollable_vertical_ = scrollable; | 419 user_scrollable_vertical_ = scrollable; |
| 419 } | 420 } |
| 420 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } | 421 bool user_scrollable_vertical() const { return user_scrollable_vertical_; } |
| 421 | 422 |
| 423 bool user_scrollable(ScrollbarOrientation orientation) const; |
| 424 |
| 422 void ApplySentScrollDeltasFromAbortedCommit(); | 425 void ApplySentScrollDeltasFromAbortedCommit(); |
| 423 void ApplyScrollDeltasSinceBeginMainFrame(); | 426 void ApplyScrollDeltasSinceBeginMainFrame(); |
| 424 | 427 |
| 425 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread) { | 428 void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread) { |
| 426 should_scroll_on_main_thread_ = should_scroll_on_main_thread; | 429 should_scroll_on_main_thread_ = should_scroll_on_main_thread; |
| 427 } | 430 } |
| 428 bool should_scroll_on_main_thread() const { | 431 bool should_scroll_on_main_thread() const { |
| 429 return should_scroll_on_main_thread_; | 432 return should_scroll_on_main_thread_; |
| 430 } | 433 } |
| 431 | 434 |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 DrawProperties<LayerImpl> draw_properties_; | 717 DrawProperties<LayerImpl> draw_properties_; |
| 715 | 718 |
| 716 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; | 719 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; |
| 717 | 720 |
| 718 DISALLOW_COPY_AND_ASSIGN(LayerImpl); | 721 DISALLOW_COPY_AND_ASSIGN(LayerImpl); |
| 719 }; | 722 }; |
| 720 | 723 |
| 721 } // namespace cc | 724 } // namespace cc |
| 722 | 725 |
| 723 #endif // CC_LAYERS_LAYER_IMPL_H_ | 726 #endif // CC_LAYERS_LAYER_IMPL_H_ |
| OLD | NEW |