Revert of Added tests and reworked ink-drop touch logic

ui/views/animation/ink_drop_host_view.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 "ui/events/event.h"
 #include "ui/events/scoped_target_handler.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ skipping 159 matching lines @@
 
 gfx::Point InkDropHostView::GetInkDropCenterBasedOnLastEvent() const {
   return last_ripple_triggering_event_
              ? last_ripple_triggering_event_->location()
              : GetLocalBounds().CenterPoint();
 }
 
 void InkDropHostView::AnimateInkDrop(InkDropState state,
                                      const ui::LocatedEvent* event) {
 #if defined(OS_WIN)
-  // On Windows, don't initiate ink-drops for touch/gesture events.
-  // Additionally, certain event states should dismiss existing ink-drop
-  // animations. If the state is already other than HIDDEN, presumably from
-  // a mouse or keyboard event, then the state should be allowed. Conversely,
-  // if the requested state is ACTIVATED, then it should always be allowed.
-  if (event && (event->IsTouchEvent() || event->IsGestureEvent()) &&
-      ink_drop_->GetTargetInkDropState() == InkDropState::HIDDEN &&
-      state != InkDropState::ACTIVATED)
-    return;
+  // On Windows, don't initiate ink-drops. Additionally, certain event states
+  // should dismiss existing ink-drop animations.
+  if (event && event->IsGestureEvent()) {
+    // Don't transition the ink-drop to a "pending" state from a touch event.
+    if (state == InkDropState::ACTION_PENDING ||
+        state == InkDropState::ALTERNATE_ACTION_PENDING)
+      return;
+    // If the state is already pending, presumably from a mouse or keyboard
+    // event, then a "triggered" action state should be allowed. Conversely,
+    // if the state had already transitioned to hidden, then the touch event
+    // is ignored.
+    if ((state == InkDropState::ACTION_TRIGGERED ||
+         state == InkDropState::ALTERNATE_ACTION_TRIGGERED) &&
+        ink_drop_->GetTargetInkDropState() == InkDropState::HIDDEN)
+      return;
+  }
 #endif
   last_ripple_triggering_event_.reset(
       event ? ui::Event::Clone(*event).release()->AsLocatedEvent() : nullptr);
   ink_drop_->AnimateToState(state);
 }
 
 void InkDropHostView::VisibilityChanged(View* starting_from, bool is_visible) {
   View::VisibilityChanged(starting_from, is_visible);
   if (GetWidget() && !is_visible) {
     ink_drop()->AnimateToState(InkDropState::HIDDEN);
@@ skipping 43 matching lines @@
       gesture_handler_.reset(new InkDropGestureHandler(this, ink_drop_.get()));
     else
       gesture_handler_->SetInkDrop(ink_drop_.get());
   } else {
     gesture_handler_.reset();
     ink_drop_.reset(new InkDropStub());
   }
 }
 
 }  // namespace views