[Android] Fix several selection handle-related issues

content/browser/renderer_host/input/touch_selection_controller_unittest.cc

 // Copyright 2014 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 "content/browser/renderer_host/input/touch_selection_controller.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/mock_motion_event.h"
 
 using ui::test::MockMotionEvent;
@@ skipping 169 matching lines @@
   scoped_ptr<TouchSelectionController> controller_;
 };
 
 TEST_F(TouchSelectionControllerTest, InsertionBasic) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
 
   // Insertion events are ignored until automatic showing is enabled.
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
 
   // Insertion events are ignored until the selection region is marked editable.
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
+
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
-
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   insertion_rect.Offset(1, 0);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_MOVED, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   insertion_rect.Offset(0, 1);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_MOVED, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   ClearInsertion();
   EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionClearedWhenNoLongerEditable) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
 
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnSelectionEditable(false);
   EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
 }
 
+TEST_F(TouchSelectionControllerTest, InsertionStaysHiddenIfEmptyRegionTapped) {
+  gfx::RectF insertion_rect(5, 5, 0, 10);
+  bool visible = true;
+  controller().OnSelectionEditable(true);
+
+  // Taps should be ignored if they're in an empty editable region.
+  controller().OnTapEvent();
+  controller().OnSelectionEmpty(true);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
+
+  // Once the region becomes editable, taps should show the insertion handle.
+  controller().OnTapEvent();
+  controller().OnSelectionEmpty(false);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
+
+  // Reset the selection.
+  controller().HideAndDisallowShowingAutomatically();
+  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+
+  // Long-pressing should show the handle even if the editable region is empty.
+  insertion_rect.Offset(2, -2);
+  controller().OnLongPressEvent();
+  controller().OnSelectionEmpty(true);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
+}
+
+TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) {
+  gfx::RectF insertion_rect(5, 5, 0, 10);
+  bool visible = true;
+
+  // Simulate the user tapping an empty text field.
+  controller().OnTapEvent();
+  controller().OnSelectionEditable(true);
+  controller().OnSelectionEmpty(true);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
+
+  // Simulate the cursor moving while a user is typing.
+  insertion_rect.Offset(10, 0);
+  controller().OnSelectionEmpty(false);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
+
+  // If the user taps the *same* position as the cursor at the end of the text
+  // entry, the handle should appear.
+  controller().OnTapEvent();
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
+}
+
 TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) {
-  controller().ShowSelectionHandlesAutomatically();
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnLongPressEvent();
   controller().OnSelectionEditable(true);
 
   gfx::RectF anchor_rect(5, 5, 0, 10);
   gfx::RectF focus_rect(50, 5, 0, 10);
   bool visible = true;
 
   ChangeInsertion(anchor_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   ChangeSelection(anchor_rect, visible, focus_rect, visible);
   EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   ChangeInsertion(focus_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(focus_rect.bottom_left(), GetLastEventAnchor());
 
-  controller().HideAndDisallowAutomaticShowing();
+  controller().HideAndDisallowShowingAutomatically();
   EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
 
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   ChangeInsertion(focus_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(focus_rect.bottom_left(), GetLastEventAnchor());
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionDragged) {
   base::TimeTicks event_time = base::TimeTicks::Now();
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
 
   // The touch sequence should not be handled if insertion is not active.
   MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_FALSE(controller().WillHandleTouchEvent(event));
 
   float line_height = 10.f;
   gfx::RectF anchor_rect(10, 0, 0, line_height);
   bool visible = true;
   ChangeInsertion(anchor_rect, visible);
@@ skipping 28 matching lines @@
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_FALSE(GetAndResetCaretMoved());
 
   // Once the drag is complete, no more touch events should be consumed until
   // the next ACTION_DOWN.
   EXPECT_FALSE(controller().WillHandleTouchEvent(event));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionTapped) {
   base::TimeTicks event_time = base::TimeTicks::Now();
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
   SetDraggingEnabled(true);
 
   gfx::RectF anchor_rect(10, 0, 0, 10);
   bool visible = true;
   ChangeInsertion(anchor_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
 
   MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_EQ(INSERTION_TAPPED, GetLastEventType());
 
   // Reset the insertion.
   ClearInsertion();
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   ChangeInsertion(anchor_rect, visible);
   ASSERT_EQ(INSERTION_SHOWN, GetLastEventType());
 
   // No tap should be signalled if the time between DOWN and UP was too long.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   event = MockMotionEvent(MockMotionEvent::ACTION_UP,
                           event_time + base::TimeDelta::FromSeconds(1),
                           0,
                           0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
 
   // Reset the insertion.
   ClearInsertion();
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   ChangeInsertion(anchor_rect, visible);
   ASSERT_EQ(INSERTION_SHOWN, GetLastEventType());
 
   // No tap should be signalled if the touch sequence is cancelled.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   event = MockMotionEvent(MockMotionEvent::ACTION_CANCEL, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
 }
 
 TEST_F(TouchSelectionControllerTest, SelectionBasic) {
   gfx::RectF anchor_rect(5, 5, 0, 10);
   gfx::RectF focus_rect(50, 5, 0, 10);
   bool visible = true;
 
   // Selection events are ignored until automatic showing is enabled.
   ChangeSelection(anchor_rect, visible, focus_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 
-  controller().ShowSelectionHandlesAutomatically();
+  controller().OnLongPressEvent();
   ChangeSelection(anchor_rect, visible, focus_rect, visible);
   EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   anchor_rect.Offset(1, 0);
   ChangeSelection(anchor_rect, visible, focus_rect, visible);
   // Selection movement does not currently trigger a separate event.
   EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
 
   ClearSelection();
   EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 }
 
 TEST_F(TouchSelectionControllerTest, SelectionDragged) {
   base::TimeTicks event_time = base::TimeTicks::Now();
-  controller().ShowSelectionHandlesAutomatically();
+  controller().OnLongPressEvent();
 
   // The touch sequence should not be handled if selection is not active.
   MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_FALSE(controller().WillHandleTouchEvent(event));
 
   float line_height = 10.f;
   gfx::RectF anchor_rect(0, 0, 0, line_height);
   gfx::RectF focus_rect(50, 0, 0, line_height);
   bool visible = true;
   ChangeSelection(anchor_rect, visible, focus_rect, visible);
@@ skipping 34 matching lines @@
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   // Once the drag is complete, no more touch events should be consumed until
   // the next ACTION_DOWN.
   EXPECT_FALSE(controller().WillHandleTouchEvent(event));
 }
 
 TEST_F(TouchSelectionControllerTest, Animation) {
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
 
   gfx::RectF insertion_rect(5, 5, 0, 10);
 
   bool visible = true;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 
   visible = false;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_TRUE(GetAndResetNeedsAnimate());
 
   visible = true;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_TRUE(GetAndResetNeedsAnimate());
 
   // If the handles are explicity hidden, no animation should be triggered.
-  controller().HideAndDisallowAutomaticShowing();
+  controller().HideAndDisallowShowingAutomatically();
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 
   // If the client doesn't support animation, no animation should be triggered.
   SetAnimationEnabled(false);
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   visible = true;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 }
 
 TEST_F(TouchSelectionControllerTest, TemporarilyHidden) {
-  controller().ShowInsertionHandleAutomatically();
+  controller().OnTapEvent();
   controller().OnSelectionEditable(true);
 
   gfx::RectF insertion_rect(5, 5, 0, 10);
 
   bool visible = true;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 
   controller().SetTemporarilyHidden(true);
   EXPECT_TRUE(GetAndResetNeedsAnimate());
 
   visible = false;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 
   visible = true;
   ChangeInsertion(insertion_rect, visible);
   EXPECT_FALSE(GetAndResetNeedsAnimate());
 
   controller().SetTemporarilyHidden(false);
   EXPECT_TRUE(GetAndResetNeedsAnimate());
 }
 
 }  // namespace content