Added tests and reworked ink-drop touch logic

ui/views/animation/ink_drop_host_view_unittest.cc

 // Copyright 2016 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_host_view.h"
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
 
 namespace views {
 namespace test {
 
+class InkDropHostViewColor : public InkDropHostView {
+ protected:
+  SkColor GetInkDropBaseColor() const override {
+    return gfx::kPlaceholderColor;
+  }

[kylix_rd, 2016/06/30 21:45:53]

Added this override to work around the NOTREACHED statement in the
InkDropHosView::GetInkDropBaseColor() base virtual implementation.

+};
+
 class InkDropHostViewTest : public testing::Test {
  public:
   InkDropHostViewTest();
   ~InkDropHostViewTest() override;
 
  protected:
   // Test target.
-  InkDropHostView host_view_;
+  InkDropHostViewColor host_view_;
 
   // Provides internal access to |host_view_| test target.
   InkDropHostViewTestApi test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InkDropHostViewTest);
 };
 
 InkDropHostViewTest::InkDropHostViewTest() : test_api_(&host_view_) {}
 
@@ skipping 27 matching lines @@
   test_api_.SetHasInkDrop(true);
   EXPECT_TRUE(test_api_.HasGestureHandler());
 
   test_api_.SetHasInkDrop(true);
   EXPECT_TRUE(test_api_.HasGestureHandler());
 
   test_api_.SetHasInkDrop(false);
   EXPECT_FALSE(test_api_.HasGestureHandler());
 }
 
+#if defined(OS_WIN)
+TEST_F(InkDropHostViewTest, NoInkDropOnTouchOrGestureEvents) {
+  host_view_.SetSize(gfx::Size(20, 20));
+
+  test_api_.SetHasInkDrop(true);
+
+  // Ensure the target ink drop is in the expected state.
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::HIDDEN);
+
+  ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(5, 6), 1,
+                             ui::EventTimeForNow());
+
+  test_api_.AnimateInkDrop(InkDropState::ACTION_PENDING, &touch_event);
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::HIDDEN);
+
+  test_api_.AnimateInkDrop(InkDropState::ALTERNATE_ACTION_PENDING,
+                           &touch_event);
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::HIDDEN);
+}
+
+TEST_F(InkDropHostViewTest, DismissInkDropOnTouchOrGestureEvents) {
+  host_view_.SetSize(gfx::Size(20, 20));
+
+  test_api_.SetHasInkDrop(true);
+
+  // Ensure the target ink drop is in the expected state.
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::HIDDEN);
+
+  ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(5, 6),
+                             gfx::Point(5, 6), ui::EventTimeForNow(),
+                             ui::EF_LEFT_MOUSE_BUTTON, 0);
+
+  test_api_.AnimateInkDrop(InkDropState::ACTION_PENDING, &mouse_event);
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::ACTION_PENDING);
+
+  ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(5, 6), 1,
+                             ui::EventTimeForNow());
+
+  test_api_.AnimateInkDrop(InkDropState::ACTION_TRIGGERED, &touch_event);
+  EXPECT_EQ(test_api_.ink_drop()->GetTargetInkDropState(),
+            InkDropState::ACTION_TRIGGERED);
+}
+#endif
+
 }  // namespace test
 }  // namespace views