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

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

Issue 1832963002: MD - add ripples to DL shelf items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: worth reviewing Created 4 years, 9 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
Index: ui/views/animation/ink_drop_animation_controller_impl.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_impl.cc b/ui/views/animation/ink_drop_animation_controller_impl.cc
index def6df3bb6f0b75a9938766ca38dabad570b65b3..811cd82451939d23dffd22a01acb8990b72d229d 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.cc
+++ b/ui/views/animation/ink_drop_animation_controller_impl.cc
@@ -113,7 +113,7 @@ void InkDropAnimationControllerImpl::SetHovered(bool is_hovered) {
void InkDropAnimationControllerImpl::CompleteHiddenTargetedAnimations() {
if (ink_drop_animation_->target_ink_drop_state() == InkDropState::HIDDEN ||
ShouldAnimateToHidden(ink_drop_animation_->target_ink_drop_state())) {
- ink_drop_animation_->HideImmediately();
+ CreateInkDropAnimation();
Evan Stade 2016/03/31 03:41:27 this change probably warrants a rename of the fn.
bruthig 2016/03/31 19:39:03 I was really, really hoping not to tie the lifetim
Evan Stade 2016/03/31 21:07:38 I don't think that's a perf optimization worth wor
bruthig 2016/03/31 22:46:19 Acknowledged. At one point I was flirting with th
Evan Stade 2016/04/01 19:03:13 I guess ink drop delegate can store the last touch
}
}

Powered by Google App Engine
This is Rietveld 408576698