| 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;
|
|
|