Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: cc/layers/layer.h

Issue 948243003: cc: Misc animation refactoring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address danakj's comment. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/blink/web_layer_impl.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 LayerTreeHost* layer_tree_host() { return layer_tree_host_; } 404 LayerTreeHost* layer_tree_host() { return layer_tree_host_; }
405 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; } 405 const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }
406 406
407 // Set the priority of all desired textures in this layer. 407 // Set the priority of all desired textures in this layer.
408 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) {} 408 virtual void SetTexturePriorities(const PriorityCalculator& priority_calc) {}
409 409
410 bool AddAnimation(scoped_ptr<Animation> animation); 410 bool AddAnimation(scoped_ptr<Animation> animation);
411 void PauseAnimation(int animation_id, double time_offset); 411 void PauseAnimation(int animation_id, double time_offset);
412 void RemoveAnimation(int animation_id); 412 void RemoveAnimation(int animation_id);
413 void RemoveAnimation(int animation_id, Animation::TargetProperty property);
413 414
414 LayerAnimationController* layer_animation_controller() { 415 LayerAnimationController* layer_animation_controller() {
415 return layer_animation_controller_.get(); 416 return layer_animation_controller_.get();
416 } 417 }
417 void SetLayerAnimationControllerForTest( 418 void SetLayerAnimationControllerForTest(
418 scoped_refptr<LayerAnimationController> controller); 419 scoped_refptr<LayerAnimationController> controller);
419 420
420 void set_layer_animation_delegate(AnimationDelegate* delegate) { 421 void set_layer_animation_delegate(AnimationDelegate* delegate) {
421 layer_animation_controller_->set_layer_animation_delegate(delegate); 422 layer_animation_controller_->set_layer_animation_delegate(delegate);
422 } 423 }
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 712
712 std::vector<FrameTimingRequest> frame_timing_requests_; 713 std::vector<FrameTimingRequest> frame_timing_requests_;
713 bool frame_timing_requests_dirty_; 714 bool frame_timing_requests_dirty_;
714 715
715 DISALLOW_COPY_AND_ASSIGN(Layer); 716 DISALLOW_COPY_AND_ASSIGN(Layer);
716 }; 717 };
717 718
718 } // namespace cc 719 } // namespace cc
719 720
720 #endif // CC_LAYERS_LAYER_H_ 721 #endif // CC_LAYERS_LAYER_H_
OLDNEW
« no previous file with comments | « cc/blink/web_layer_impl.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698