| 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 ba234127affc013b5b47ba79b2ef65abea8b4166..f206f8f833e2393aa7a0fe85cb8058c85a704fcc 100644
|
| --- a/ui/views/animation/ink_drop_impl.cc
|
| +++ b/ui/views/animation/ink_drop_impl.cc
|
| @@ -73,10 +73,6 @@ InkDropState InkDropImpl::GetTargetInkDropState() const {
|
| return ink_drop_ripple_->target_ink_drop_state();
|
| }
|
|
|
| -bool InkDropImpl::IsVisible() const {
|
| - return ink_drop_ripple_ && ink_drop_ripple_->IsVisible();
|
| -}
|
| -
|
| void InkDropImpl::AnimateToState(InkDropState ink_drop_state) {
|
| DestroyHiddenTargetedAnimations();
|
| if (!ink_drop_ripple_)
|
| @@ -224,7 +220,7 @@ void InkDropImpl::SetHighlight(bool should_highlight,
|
|
|
| if (should_highlight) {
|
| CreateInkDropHover();
|
| - if (hover_ && !IsVisible())
|
| + if (hover_ && !(ink_drop_ripple_ && ink_drop_ripple_->IsVisible()))
|
| hover_->FadeIn(animation_duration);
|
| } else {
|
| hover_->FadeOut(animation_duration, explode);
|
|
|