Allow InkDropRipple to co-exist with highlight

ui/views/animation/ink_drop_ripple.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_ripple.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 13 matching lines @@
 }
 
 const float InkDropRipple::kHiddenOpacity = 0.f;
 
 InkDropRipple::InkDropRipple()
     : target_ink_drop_state_(InkDropState::HIDDEN), observer_(nullptr) {}
 
 InkDropRipple::~InkDropRipple() {}
 
 void InkDropRipple::AnimateToState(InkDropState ink_drop_state) {
+  if (!GetRootLayer())
+    return;
+
   // Does not return early if |target_ink_drop_state_| == |ink_drop_state| for
   // two reasons.
   // 1. The attached observers must be notified of all animations started and
   // ended.
   // 2. Not all state transitions is are valid, especially no-op transitions,
   // and these should be detected by DCHECKs in AnimateStateChange().
 
   // |animation_observer| will be deleted when AnimationEndedCallback() returns
   // true.
   // TODO(bruthig): Implement a safer ownership model for the
@@ skipping 17 matching lines @@
   }
 
   AnimateStateChange(old_ink_drop_state, target_ink_drop_state_,
                      animation_observer);
   animation_observer->SetActive();
   // |this| may be deleted! |animation_observer| might synchronously call
   // AnimationEndedCallback which can delete |this|.
 }
 
 void InkDropRipple::SnapToActivated() {
+  if (!GetRootLayer())
+    return;
+
   AbortAllAnimations();
   // |animation_observer| will be deleted when AnimationEndedCallback() returns
   // true.
   // TODO(bruthig): Implement a safer ownership model for the
   // |animation_observer|.
   ui::CallbackLayerAnimationObserver* animation_observer =
       new ui::CallbackLayerAnimationObserver(
           base::Bind(&InkDropRipple::AnimationStartedCallback,
                      base::Unretained(this), InkDropState::ACTIVATED),
           base::Bind(&InkDropRipple::AnimationEndedCallback,
                      base::Unretained(this), InkDropState::ACTIVATED));
   GetRootLayer()->SetVisible(true);
   target_ink_drop_state_ = InkDropState::ACTIVATED;
   animation_observer->SetActive();
 }
 
+bool InkDropRipple::IsVisible() {
+  return GetRootLayer() && GetRootLayer()->visible();
+}
+
 void InkDropRipple::HideImmediately() {
   AbortAllAnimations();
   SetStateToHidden();
   target_ink_drop_state_ = InkDropState::HIDDEN;
 }
 
 test::InkDropRippleTestApi* InkDropRipple::GetTestApi() {
   return nullptr;
 }
 
@@ skipping 10 matching lines @@
     SetStateToHidden();
   observer_->AnimationEnded(ink_drop_state,
                             observer.aborted_count()
                                 ? InkDropAnimationEndedReason::PRE_EMPTED
                                 : InkDropAnimationEndedReason::SUCCESS);
   // |this| may be deleted!
   return true;
 }
 
 }  // namespace views