| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 // |num_dependents_need_push_properties_| are always updated, but the rest | 411 // |num_dependents_need_push_properties_| are always updated, but the rest |
| 412 // of |proto| is only read if |needs_push_properties_| is set. | 412 // of |proto| is only read if |needs_push_properties_| is set. |
| 413 void FromLayerPropertiesProto(const proto::LayerProperties& proto); | 413 void FromLayerPropertiesProto(const proto::LayerProperties& proto); |
| 414 | 414 |
| 415 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } | 415 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } |
| 416 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } | 416 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } |
| 417 | 417 |
| 418 bool AddAnimation(scoped_ptr<Animation> animation); | 418 bool AddAnimation(scoped_ptr<Animation> animation); |
| 419 void PauseAnimation(int animation_id, double time_offset); | 419 void PauseAnimation(int animation_id, double time_offset); |
| 420 void RemoveAnimation(int animation_id); | 420 void RemoveAnimation(int animation_id); |
| 421 void RemoveAnimation(int animation_id, Animation::TargetProperty property); | |
| 422 void AbortAnimation(int animation_id); | 421 void AbortAnimation(int animation_id); |
| 423 LayerAnimationController* layer_animation_controller() const { | 422 LayerAnimationController* layer_animation_controller() const { |
| 424 return layer_animation_controller_.get(); | 423 return layer_animation_controller_.get(); |
| 425 } | 424 } |
| 426 void SetLayerAnimationControllerForTest( | 425 void SetLayerAnimationControllerForTest( |
| 427 scoped_refptr<LayerAnimationController> controller); | 426 scoped_refptr<LayerAnimationController> controller); |
| 428 | 427 |
| 429 void set_layer_animation_delegate(AnimationDelegate* delegate) { | 428 void set_layer_animation_delegate(AnimationDelegate* delegate) { |
| 430 DCHECK(layer_animation_controller_); | 429 DCHECK(layer_animation_controller_); |
| 431 layer_animation_controller_->set_layer_animation_delegate(delegate); | 430 layer_animation_controller_->set_layer_animation_delegate(delegate); |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 793 std::vector<FrameTimingRequest> frame_timing_requests_; | 792 std::vector<FrameTimingRequest> frame_timing_requests_; |
| 794 bool frame_timing_requests_dirty_; | 793 bool frame_timing_requests_dirty_; |
| 795 bool is_hidden_from_property_trees_; | 794 bool is_hidden_from_property_trees_; |
| 796 | 795 |
| 797 DISALLOW_COPY_AND_ASSIGN(Layer); | 796 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 798 }; | 797 }; |
| 799 | 798 |
| 800 } // namespace cc | 799 } // namespace cc |
| 801 | 800 |
| 802 #endif // CC_LAYERS_LAYER_H_ | 801 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |