| Index: ui/views/animation/ink_drop_impl.cc
|
| diff --git a/ui/views/animation/ink_drop_impl.cc b/ui/views/animation/ink_drop_impl.cc
|
| index cc5f07966b689f01597a86b4f3f6fc30db6ba54e..0ec1aefd6149484a5282fd9309cbd50a28bf1733 100644
|
| --- a/ui/views/animation/ink_drop_impl.cc
|
| +++ b/ui/views/animation/ink_drop_impl.cc
|
| @@ -315,8 +315,13 @@ void InkDropImpl::HideHighlightOnRippleHiddenState::OnFocusChanged() {
|
| void InkDropImpl::HideHighlightOnRippleHiddenState::AnimationStarted(
|
| InkDropState ink_drop_state) {
|
| if (ink_drop_state == views::InkDropState::DEACTIVATED &&
|
| - GetInkDrop()->is_focused_) {
|
| - GetInkDrop()->ink_drop_ripple_->HideImmediately();
|
| + GetInkDrop()->ShouldHighlightBasedOnFocus()) {
|
| + // It's possible to get animation started events when destroying the
|
| + // |ink_drop_ripple_|.
|
| + // TODO(bruthig): Investigate if the animation framework can address this
|
| + // issue instead. See https://crbug.com/663335.
|
| + if (GetInkDrop()->ink_drop_ripple_)
|
| + GetInkDrop()->ink_drop_ripple_->HideImmediately();
|
| GetInkDrop()->SetHighlightState(
|
| state_factory()->CreateVisibleState(base::TimeDelta(), false));
|
| }
|
|
|