ui/views/animation/ink_drop_impl.cc - Issue 2499453002: Add ink drop ripple to overview mode button

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/animation/ink_drop_impl.cc

Issue 2499453002: Add ink drop ripple to overview mode button (Closed)

Patch Set: Rebased Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 dd44207c767f6df2642ede94b45dbecfcaf90839..b61932fe6cd6e020bf778cbd4cf1e198403c9a82 100644

--- a/ui/views/animation/ink_drop_impl.cc

+++ b/ui/views/animation/ink_drop_impl.cc

@@ -738,6 +738,9 @@ void InkDropImpl::AnimationEnded(InkDropState ink_drop_state,

highlight_state_->AnimationEnded(ink_drop_state, reason);

if (reason != InkDropAnimationEndedReason::SUCCESS)

return;

+ // |ink_drop_ripple_| might be null during destruction.

+ if (!ink_drop_ripple_)

+ return;

if (ShouldAnimateToHidden(ink_drop_state)) {

ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN);

} else if (ink_drop_state == views::InkDropState::HIDDEN) {