| 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 #include <vector> | 10 #include <vector> |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 // of |proto| is only read if |needs_push_properties_| is set. | 406 // of |proto| is only read if |needs_push_properties_| is set. |
| 407 void FromLayerPropertiesProto(const proto::LayerProperties& proto); | 407 void FromLayerPropertiesProto(const proto::LayerProperties& proto); |
| 408 | 408 |
| 409 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } | 409 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } |
| 410 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } | 410 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } |
| 411 | 411 |
| 412 bool AddAnimation(scoped_ptr<Animation> animation); | 412 bool AddAnimation(scoped_ptr<Animation> animation); |
| 413 void PauseAnimation(int animation_id, double time_offset); | 413 void PauseAnimation(int animation_id, double time_offset); |
| 414 void RemoveAnimation(int animation_id); | 414 void RemoveAnimation(int animation_id); |
| 415 void RemoveAnimation(int animation_id, Animation::TargetProperty property); | 415 void RemoveAnimation(int animation_id, Animation::TargetProperty property); |
| 416 void AbortAnimation(int animation_id); |
| 416 LayerAnimationController* layer_animation_controller() const { | 417 LayerAnimationController* layer_animation_controller() const { |
| 417 return layer_animation_controller_.get(); | 418 return layer_animation_controller_.get(); |
| 418 } | 419 } |
| 419 void SetLayerAnimationControllerForTest( | 420 void SetLayerAnimationControllerForTest( |
| 420 scoped_refptr<LayerAnimationController> controller); | 421 scoped_refptr<LayerAnimationController> controller); |
| 421 | 422 |
| 422 void set_layer_animation_delegate(AnimationDelegate* delegate) { | 423 void set_layer_animation_delegate(AnimationDelegate* delegate) { |
| 423 DCHECK(layer_animation_controller_); | 424 DCHECK(layer_animation_controller_); |
| 424 layer_animation_controller_->set_layer_animation_delegate(delegate); | 425 layer_animation_controller_->set_layer_animation_delegate(delegate); |
| 425 } | 426 } |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 | 790 |
| 790 std::vector<FrameTimingRequest> frame_timing_requests_; | 791 std::vector<FrameTimingRequest> frame_timing_requests_; |
| 791 bool frame_timing_requests_dirty_; | 792 bool frame_timing_requests_dirty_; |
| 792 | 793 |
| 793 DISALLOW_COPY_AND_ASSIGN(Layer); | 794 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 794 }; | 795 }; |
| 795 | 796 |
| 796 } // namespace cc | 797 } // namespace cc |
| 797 | 798 |
| 798 #endif // CC_LAYERS_LAYER_H_ | 799 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |