Add MD Ink Drop Layers to InkDropHost only when a ripple/hover is active.

ui/views/animation/ink_drop_animation_controller_impl_unittest.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/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 120 matching lines @@
   ink_drop_animation_controller_.SetHovered(true);
   test_api_.CompleteAnimations();
 
   EXPECT_TRUE(test_api_.IsHoverFadingInOrVisible());
 
   ink_drop_animation_controller_.SnapToActivated();
 
   EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
 }
 
+TEST_F(InkDropAnimationControllerImplTest, LayersRemovedFromHostAfterHover) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+
+  ink_drop_animation_controller_.SetHovered(false);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest, LayersRemovedFromHostAfterInkDrop) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersAddedToHostWhenHoverOrInkDropVisible) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  EXPECT_TRUE(task_runner_->HasPendingTask());
+  task_runner_->RunPendingTasks();
+
+  // Hover should be fading back in.
+  EXPECT_TRUE(test_api_.HasActiveAnimations());
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersNotAddedToHostWhenHoverTimeFires) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_host_.set_should_show_hover(false);
+
+  EXPECT_TRUE(task_runner_->HasPendingTask());
+  task_runner_->RunPendingTasks();
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersArentRemovedWhenPreemptingFadeOut) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+
+  ink_drop_animation_controller_.SetHovered(false);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+}
+
 }  // namespace views