Color the ink drop ripple and hover effects based on theming.

ui/views/animation/ink_drop_animation_controller_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_host.h"
@@ skipping 36 matching lines @@
       return false;
   }
 }
 
 }  // namespace
 
 InkDropAnimationControllerImpl::InkDropAnimationControllerImpl(
     InkDropHost* ink_drop_host)
     : ink_drop_host_(ink_drop_host),
       root_layer_(new ui::Layer(ui::LAYER_NOT_DRAWN)),
-      can_destroy_after_hidden_animation_(true),
       hover_after_animation_timer_(nullptr) {
   root_layer_->set_name("InkDropAnimationControllerImpl:RootLayer");
   ink_drop_host_->AddInkDropLayer(root_layer_.get());
 }
 
 InkDropAnimationControllerImpl::~InkDropAnimationControllerImpl() {
   // Explicitly destroy the InkDropAnimation so that this still exists if
   // views::InkDropAnimationObserver methods are called on this.
   DestroyInkDropAnimation();
   ink_drop_host_->RemoveInkDropLayer(root_layer_.get());
 }
 
 InkDropState InkDropAnimationControllerImpl::GetTargetInkDropState() const {
   if (!ink_drop_animation_)
     return InkDropState::HIDDEN;
   return ink_drop_animation_->GetTargetInkDropState();
 }
 
 bool InkDropAnimationControllerImpl::IsVisible() const {
   return ink_drop_animation_ && ink_drop_animation_->IsVisible();
 }
 
 void InkDropAnimationControllerImpl::AnimateToState(
     InkDropState ink_drop_state) {
   if (!ink_drop_animation_)
     CreateInkDropAnimation();
 
-  // The InkDropAnimationObserver::InkDropAnimationEnded() callback needs to
-  // know if it is safe to destroy the |ink_drop_animation_| and it is not safe
-  // when the notification is raised within a call to
-  // InkDropAnimation::AnimateToState().
-  base::AutoReset<bool> auto_reset_can_destroy_after_hidden_animation(
-      &can_destroy_after_hidden_animation_, false);
-
   if (ink_drop_state != views::InkDropState::HIDDEN) {
     SetHoveredInternal(false, base::TimeDelta::FromMilliseconds(
                                   kHoverFadeOutBeforeAnimationDurationInMs));
   }
 
   // Make sure the ink drop starts from the HIDDEN state it was going to auto
   // transition to it.
   if (ink_drop_animation_->GetTargetInkDropState() == InkDropState::HIDDEN ||
       ShouldAnimateToHidden(ink_drop_animation_->GetTargetInkDropState())) {
     ink_drop_animation_->HideImmediately();
   }
   ink_drop_animation_->AnimateToState(ink_drop_state);

[bruthig, 2016/02/23 22:48:09]

Here would be a good spot to note that |ink_drop_animation_| could be null.  I
don't think it's obvious.

[Evan Stade, 2016/02/24 00:31:57]

I don't think it's super helpful because the crash that would occur if you tried
to use ink_drop_animation_ here is fairly obvious (it's not as insidious as when
|this| is destroyed. In general I don't like leaving comments if I don't think
they're very warranted because comments tend to get out of sync with reality, at
which point they do more harm than good.

[bruthig, 2016/02/24 15:46:55]

Acknowledged.

 }
 
 void InkDropAnimationControllerImpl::SetHovered(bool is_hovered) {
   SetHoveredInternal(is_hovered,
                      is_hovered ? base::TimeDelta::FromMilliseconds(
                                       kHoverFadeInFromUserInputDurationInMs)
                                 : base::TimeDelta::FromMilliseconds(
                                       kHoverFadeOutFromUserInputDurationInMs));
 }
 
 void InkDropAnimationControllerImpl::CreateInkDropAnimation() {
   DestroyInkDropAnimation();
   ink_drop_animation_ = ink_drop_host_->CreateInkDropAnimation();
-  ink_drop_animation_->AddObserver(this);
+  ink_drop_animation_->set_observer(this);
   root_layer_->Add(ink_drop_animation_->GetRootLayer());
 }
 
 void InkDropAnimationControllerImpl::DestroyInkDropAnimation() {
   if (!ink_drop_animation_)
     return;
   root_layer_->Remove(ink_drop_animation_->GetRootLayer());
-  ink_drop_animation_->RemoveObserver(this);
   ink_drop_animation_.reset();
 }
 
 void InkDropAnimationControllerImpl::CreateInkDropHover() {
   DestroyInkDropHover();
 
   hover_ = ink_drop_host_->CreateInkDropHover();
   if (!hover_)
     return;
   root_layer_->Add(hover_->layer());
@@ skipping 16 matching lines @@
 
 void InkDropAnimationControllerImpl::InkDropAnimationEnded(
     InkDropState ink_drop_state,
     InkDropAnimationEndedReason reason) {
   if (reason != SUCCESS)
     return;
   if (ShouldAnimateToHidden(ink_drop_state)) {
     ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
   } else if (ink_drop_state == views::InkDropState::HIDDEN) {
     StartHoverAfterAnimationTimer();
-    if (can_destroy_after_hidden_animation_) {
-      // TODO(bruthig): Investigate whether creating and destroying
-      // InkDropAnimations is expensive and consider creating an
-      // InkDropAnimationPool. See www.crbug.com/522175.
-      DestroyInkDropAnimation();
-    }
+    // TODO(bruthig): Investigate whether creating and destroying
+    // InkDropAnimations is expensive and consider creating an
+    // InkDropAnimationPool. See www.crbug.com/522175.
+    DestroyInkDropAnimation();
   }
 }
 
 void InkDropAnimationControllerImpl::SetHoveredInternal(
     bool is_hovered,
     base::TimeDelta animation_duration) {
   StopHoverAfterAnimationTimer();
 
   if (IsHoverFadingInOrVisible() == is_hovered)
     return;
@@ skipping 25 matching lines @@
     hover_after_animation_timer_.reset();
 }
 
 void InkDropAnimationControllerImpl::HoverAfterAnimationTimerFired() {
   SetHoveredInternal(true, base::TimeDelta::FromMilliseconds(
                                kHoverFadeInAfterAnimationDurationInMs));
   hover_after_animation_timer_.reset();
 }
 
 }  // namespace views