| Index: ui/views/animation/ink_drop_ripple.cc
|
| diff --git a/ui/views/animation/ink_drop_ripple.cc b/ui/views/animation/ink_drop_ripple.cc
|
| index 0794be64898bb0855b94f7ce5b88e14db9874669..22306a933a9aab4b1eb0b97da191745d9b8f89ea 100644
|
| --- a/ui/views/animation/ink_drop_ripple.cc
|
| +++ b/ui/views/animation/ink_drop_ripple.cc
|
| @@ -103,7 +103,8 @@ test::InkDropRippleTestApi* InkDropRipple::GetTestApi() {
|
| void InkDropRipple::AnimationStartedCallback(
|
| InkDropState ink_drop_state,
|
| const ui::CallbackLayerAnimationObserver& observer) {
|
| - observer_->AnimationStarted(ink_drop_state);
|
| + if (observer_)
|
| + observer_->AnimationStarted(ink_drop_state);
|
| }
|
|
|
| bool InkDropRipple::AnimationEndedCallback(
|
| @@ -111,10 +112,11 @@ bool InkDropRipple::AnimationEndedCallback(
|
| const ui::CallbackLayerAnimationObserver& observer) {
|
| if (ink_drop_state == InkDropState::HIDDEN)
|
| SetStateToHidden();
|
| - observer_->AnimationEnded(ink_drop_state,
|
| - observer.aborted_count()
|
| - ? InkDropAnimationEndedReason::PRE_EMPTED
|
| - : InkDropAnimationEndedReason::SUCCESS);
|
| + if (observer_)
|
| + observer_->AnimationEnded(ink_drop_state,
|
| + observer.aborted_count()
|
| + ? InkDropAnimationEndedReason::PRE_EMPTED
|
| + : InkDropAnimationEndedReason::SUCCESS);
|
| // |this| may be deleted!
|
| return true;
|
| }
|
|
|