Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

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

Issue 2615613003: Fix double ripple on activated flood fill ripple (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/flood_fill_ink_drop_ripple.cc
diff --git a/ui/views/animation/flood_fill_ink_drop_ripple.cc b/ui/views/animation/flood_fill_ink_drop_ripple.cc
index 10459d8c956d81588dbb6497b2631fd6b9415ffe..9bd5be86719b4a205d243ce2ba5e1454d26cbe3d 100644
--- a/ui/views/animation/flood_fill_ink_drop_ripple.cc
+++ b/ui/views/animation/flood_fill_ink_drop_ripple.cc
@@ -260,6 +260,11 @@ void FloodFillInkDropRipple::AnimateStateChange(
gfx::Tween::EASE_IN_OUT, animation_observer);
break;
case InkDropState::ACTIVATED: {
+ if (old_ink_drop_state == InkDropState::ACTION_PENDING) {
bruthig 2017/01/04 22:52:07 I believe this will cause the ACTIVATED |animation
mohsen 2017/01/05 20:14:37 Right. Done.
+ // The final state of pending animation is the same as the final state
+ // of activated animation. Nothing more to do here.
+ break;
+ }
AnimateToOpacity(visible_opacity_,
GetAnimationDuration(ACTIVATED_FADE_IN),
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698