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

Side by Side Diff: cc/animation/element_animations.h

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_ANIMATION_ELEMENT_ANIMATIONS_H_ 5 #ifndef CC_ANIMATION_ELEMENT_ANIMATIONS_H_
6 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_ 6 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_
7 7
8 #include "base/containers/linked_list.h" 8 #include "base/containers/linked_list.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 return layer_animation_controller_.get(); 51 return layer_animation_controller_.get();
52 } 52 }
53 53
54 void CreateLayerAnimationController(int layer_id); 54 void CreateLayerAnimationController(int layer_id);
55 void DestroyLayerAnimationController(); 55 void DestroyLayerAnimationController();
56 56
57 void LayerRegistered(int layer_id, LayerTreeType tree_type); 57 void LayerRegistered(int layer_id, LayerTreeType tree_type);
58 void LayerUnregistered(int layer_id, LayerTreeType tree_type); 58 void LayerUnregistered(int layer_id, LayerTreeType tree_type);
59 59
60 bool has_active_value_observer_for_testing() const { 60 bool has_active_value_observer_for_testing() const {
61 return active_value_observer_; 61 return !!active_value_observer_;
62 } 62 }
63 bool has_pending_value_observer_for_testing() const { 63 bool has_pending_value_observer_for_testing() const {
64 return pending_value_observer_; 64 return !!pending_value_observer_;
65 } 65 }
66 66
67 void AddPlayer(AnimationPlayer* player); 67 void AddPlayer(AnimationPlayer* player);
68 void RemovePlayer(AnimationPlayer* player); 68 void RemovePlayer(AnimationPlayer* player);
69 bool IsEmpty() const; 69 bool IsEmpty() const;
70 70
71 typedef base::LinkedList<AnimationPlayer> PlayersList; 71 typedef base::LinkedList<AnimationPlayer> PlayersList;
72 typedef base::LinkNode<AnimationPlayer> PlayersListNode; 72 typedef base::LinkNode<AnimationPlayer> PlayersListNode;
73 const PlayersList& players_list() const { return *players_list_.get(); } 73 const PlayersList& players_list() const { return *players_list_.get(); }
74 74
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // LAC is owned by ElementAnimations (1:1 relationship). 116 // LAC is owned by ElementAnimations (1:1 relationship).
117 scoped_refptr<LayerAnimationController> layer_animation_controller_; 117 scoped_refptr<LayerAnimationController> layer_animation_controller_;
118 AnimationHost* animation_host_; 118 AnimationHost* animation_host_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(ElementAnimations); 120 DISALLOW_COPY_AND_ASSIGN(ElementAnimations);
121 }; 121 };
122 122
123 } // namespace cc 123 } // namespace cc
124 124
125 #endif // CC_ANIMATION_ELEMENT_ANIMATIONS_H_ 125 #endif // CC_ANIMATION_ELEMENT_ANIMATIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698