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

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

Issue 632613002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/animation/animation_registrar.cc ('k') | cc/animation/layer_animation_controller.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_LAYER_ANIMATION_CONTROLLER_H_ 5 #ifndef CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
6 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_ 6 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 void AddEventObserver(LayerAnimationEventObserver* observer); 99 void AddEventObserver(LayerAnimationEventObserver* observer);
100 void RemoveEventObserver(LayerAnimationEventObserver* observer); 100 void RemoveEventObserver(LayerAnimationEventObserver* observer);
101 101
102 void set_value_provider(LayerAnimationValueProvider* provider) { 102 void set_value_provider(LayerAnimationValueProvider* provider) {
103 value_provider_ = provider; 103 value_provider_ = provider;
104 } 104 }
105 105
106 void remove_value_provider(LayerAnimationValueProvider* provider) { 106 void remove_value_provider(LayerAnimationValueProvider* provider) {
107 if (value_provider_ == provider) 107 if (value_provider_ == provider)
108 value_provider_ = NULL; 108 value_provider_ = nullptr;
109 } 109 }
110 110
111 void set_layer_animation_delegate(AnimationDelegate* delegate) { 111 void set_layer_animation_delegate(AnimationDelegate* delegate) {
112 layer_animation_delegate_ = delegate; 112 layer_animation_delegate_ = delegate;
113 } 113 }
114 114
115 void remove_layer_animation_delegate(AnimationDelegate* delegate) { 115 void remove_layer_animation_delegate(AnimationDelegate* delegate) {
116 if (layer_animation_delegate_ == delegate) 116 if (layer_animation_delegate_ == delegate)
117 layer_animation_delegate_ = NULL; 117 layer_animation_delegate_ = nullptr;
118 } 118 }
119 119
120 bool HasFilterAnimationThatInflatesBounds() const; 120 bool HasFilterAnimationThatInflatesBounds() const;
121 bool HasTransformAnimationThatInflatesBounds() const; 121 bool HasTransformAnimationThatInflatesBounds() const;
122 bool HasAnimationThatInflatesBounds() const { 122 bool HasAnimationThatInflatesBounds() const {
123 return HasTransformAnimationThatInflatesBounds() || 123 return HasTransformAnimationThatInflatesBounds() ||
124 HasFilterAnimationThatInflatesBounds(); 124 HasFilterAnimationThatInflatesBounds();
125 } 125 }
126 126
127 bool FilterAnimationBoundsForBox(const gfx::BoxF& box, 127 bool FilterAnimationBoundsForBox(const gfx::BoxF& box,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // Only try to start animations when new animations are added or when the 210 // Only try to start animations when new animations are added or when the
211 // previous attempt at starting animations failed to start all animations. 211 // previous attempt at starting animations failed to start all animations.
212 bool needs_to_start_animations_; 212 bool needs_to_start_animations_;
213 213
214 DISALLOW_COPY_AND_ASSIGN(LayerAnimationController); 214 DISALLOW_COPY_AND_ASSIGN(LayerAnimationController);
215 }; 215 };
216 216
217 } // namespace cc 217 } // namespace cc
218 218
219 #endif // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_ 219 #endif // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « cc/animation/animation_registrar.cc ('k') | cc/animation/layer_animation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698