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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/layer_animation_controller.h
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index dbb32392699c9ce32c02b0aeffb729fbda52a6d4..c7d363ce5c26dd045332c94f3ee2b4038146d7f8 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -105,7 +105,7 @@ class CC_EXPORT LayerAnimationController
void remove_value_provider(LayerAnimationValueProvider* provider) {
if (value_provider_ == provider)
- value_provider_ = NULL;
+ value_provider_ = nullptr;
}
void set_layer_animation_delegate(AnimationDelegate* delegate) {
@@ -114,7 +114,7 @@ class CC_EXPORT LayerAnimationController
void remove_layer_animation_delegate(AnimationDelegate* delegate) {
if (layer_animation_delegate_ == delegate)
- layer_animation_delegate_ = NULL;
+ layer_animation_delegate_ = nullptr;
}
bool HasFilterAnimationThatInflatesBounds() const;
« 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