Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/touch_selection/touch_selection_controller_unittest.cc

Issue 996373002: Add Aura handles to be used in unified touch selection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed issues with loading resources Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/touch_selection/touch_selection_controller_aura.cc ('K') | « ui/touch_selection/touch_selection_controller_aura_unittest.cc ('k') | ui/touch_selection/touch_selection_menu_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/touch_selection/touch_selection_controller_unittest.cc
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc
index bc8a0bc9f8659dfae14673cbf8a6e85e66694b13..4ed7f78424d2ce6a32e95042426f1599aa253e0d 100644
--- a/ui/touch_selection/touch_selection_controller_unittest.cc
+++ b/ui/touch_selection/touch_selection_controller_unittest.cc
@@ -116,22 +116,22 @@ class TouchSelectionControllerTest : public testing::Test,
void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
- void ClearSelection() {
- controller_->OnSelectionBoundsChanged(SelectionBound(),
- SelectionBound());
+ bool ClearSelection() {
+ return controller_->OnSelectionBoundsUpdated(SelectionBound(),
+ SelectionBound());
}
- void ClearInsertion() { ClearSelection(); }
+ bool ClearInsertion() { return ClearSelection(); }
- void ChangeInsertion(const gfx::RectF& rect, bool visible) {
+ bool ChangeInsertion(const gfx::RectF& rect, bool visible) {
SelectionBound bound;
bound.set_type(SelectionBound::CENTER);
bound.SetEdge(rect.origin(), rect.bottom_left());
bound.set_visible(visible);
- controller_->OnSelectionBoundsChanged(bound, bound);
+ return controller_->OnSelectionBoundsUpdated(bound, bound);
}
- void ChangeSelection(const gfx::RectF& start_rect,
+ bool ChangeSelection(const gfx::RectF& start_rect,
bool start_visible,
const gfx::RectF& end_rect,
bool end_visible) {
@@ -142,7 +142,7 @@ class TouchSelectionControllerTest : public testing::Test,
end_bound.SetEdge(end_rect.origin(), end_rect.bottom_left());
start_bound.set_visible(start_visible);
end_bound.set_visible(end_visible);
- controller_->OnSelectionBoundsChanged(start_bound, end_bound);
+ return controller_->OnSelectionBoundsUpdated(start_bound, end_bound);
}
void Animate() {
@@ -210,33 +210,33 @@ TEST_F(TouchSelectionControllerTest, InsertionBasic) {
bool visible = true;
// Insertion events are ignored until automatic showing is enabled.
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), IsEmpty());
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
controller().OnTapEvent();
// Insertion events are ignored until the selection region is marked editable.
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), IsEmpty());
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
controller().OnTapEvent();
controller().OnSelectionEditable(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
insertion_rect.Offset(1, 0);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
insertion_rect.Offset(0, 1);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
- ClearInsertion();
+ EXPECT_TRUE(ClearInsertion());
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED));
}
@@ -246,7 +246,7 @@ TEST_F(TouchSelectionControllerTest, InsertionClearedWhenNoLongerEditable) {
controller().OnTapEvent();
controller().OnSelectionEditable(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
@@ -263,13 +263,13 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
// created with |show_on_tap_for_empty_editable| set to false.
controller().OnTapEvent();
controller().OnSelectionEmpty(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
// Once the region becomes non-empty, taps should show the insertion handle.
controller().OnTapEvent();
controller().OnSelectionEmpty(false);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
@@ -281,7 +281,7 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
insertion_rect.Offset(2, -2);
controller().OnLongPressEvent();
controller().OnSelectionEmpty(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
@@ -301,7 +301,7 @@ TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) {
// controller is created with |show_on_tap_for_empty_editable| set to true.
controller().OnTapEvent();
controller().OnSelectionEmpty(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
}
@@ -314,19 +314,19 @@ TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) {
controller().OnTapEvent();
controller().OnSelectionEditable(true);
controller().OnSelectionEmpty(true);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_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_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_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
}
@@ -339,16 +339,16 @@ TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) {
gfx::RectF end_rect(50, 5, 0, 10);
bool visible = true;
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED,
SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
- ChangeInsertion(end_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED,
INSERTION_SHOWN));
EXPECT_EQ(end_rect.bottom_left(), GetLastEventAnchor());
@@ -357,7 +357,7 @@ TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) {
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED));
controller().OnTapEvent();
- ChangeInsertion(end_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(end_rect.bottom_left(), GetLastEventAnchor());
}
@@ -374,7 +374,7 @@ TEST_F(TouchSelectionControllerTest, InsertionDragged) {
float line_height = 10.f;
gfx::RectF start_rect(10, 0, 0, line_height);
bool visible = true;
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
@@ -421,7 +421,7 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
gfx::RectF start_rect(10, 0, 0, 10);
bool visible = true;
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
@@ -435,9 +435,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
INSERTION_DRAG_STOPPED));
// Reset the insertion.
- ClearInsertion();
+ EXPECT_TRUE(ClearInsertion());
controller().OnTapEvent();
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED,
INSERTION_SHOWN));
@@ -453,9 +453,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
INSERTION_DRAG_STOPPED));
// Reset the insertion.
- ClearInsertion();
+ EXPECT_TRUE(ClearInsertion());
controller().OnTapEvent();
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED,
INSERTION_SHOWN));
@@ -470,9 +470,9 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
INSERTION_DRAG_STOPPED));
// Reset the insertion.
- ClearInsertion();
+ EXPECT_TRUE(ClearInsertion());
controller().OnTapEvent();
- ChangeInsertion(start_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(start_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_CLEARED,
INSERTION_SHOWN));
@@ -493,7 +493,7 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
gfx::RectF anchor_rect(10, 0, 0, 10);
bool visible = true;
- ChangeInsertion(anchor_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(anchor_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
@@ -511,7 +511,7 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
anchor_rect.Offset(5, 15);
- ChangeInsertion(anchor_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(anchor_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_MOVED));
EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
@@ -536,20 +536,20 @@ TEST_F(TouchSelectionControllerTest, SelectionBasic) {
bool visible = true;
// Selection events are ignored until automatic showing is enabled.
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_FALSE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
controller().OnLongPressEvent();
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
start_rect.Offset(1, 0);
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
// Selection movement does not currently trigger a separate event.
EXPECT_THAT(GetAndResetEvents(), IsEmpty());
- ClearSelection();
+ EXPECT_TRUE(ClearSelection());
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED));
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
}
@@ -560,7 +560,7 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) {
bool visible = true;
controller().OnLongPressEvent();
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
@@ -568,7 +568,7 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) {
// event notification.
start_rect.Offset(10, 10);
controller().OnLongPressEvent();
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
}
@@ -585,7 +585,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDragged) {
gfx::RectF start_rect(0, 0, 0, line_height);
gfx::RectF end_rect(50, 0, 0, line_height);
bool visible = true;
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
@@ -639,7 +639,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedWithOverlap) {
gfx::RectF start_rect(0, 0, 0, line_height);
gfx::RectF end_rect(50, 0, 0, line_height);
bool visible = true;
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
@@ -677,7 +677,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
gfx::RectF start_rect(50, line_height, 0, line_height);
gfx::RectF end_rect(100, line_height, 0, line_height);
bool visible = true;
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
@@ -707,7 +707,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
EXPECT_FALSE(GetAndResetSelectionMoved());
end_rect += gfx::Vector2dF(0, 5);
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
// Move the base, triggering a swap of points.
event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time,
@@ -733,7 +733,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
EXPECT_FALSE(GetAndResetSelectionMoved());
start_rect += gfx::Vector2dF(0, 5);
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
// Move the same point again, not triggering a swap of points.
event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time,
@@ -759,7 +759,7 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
EXPECT_FALSE(GetAndResetSelectionMoved());
start_rect += gfx::Vector2dF(0, 5);
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
// Move the base, triggering a swap of points.
event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time,
@@ -794,7 +794,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragExtremeLineSize) {
gfx::RectF small_line_rect(0, 0, 0, small_line_height);
gfx::RectF large_line_rect(50, 50, 0, large_line_height);
bool visible = true;
- ChangeSelection(small_line_rect, visible, large_line_rect, visible);
+ EXPECT_TRUE(
+ ChangeSelection(small_line_rect, visible, large_line_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
EXPECT_EQ(small_line_rect.bottom_left(), GetLastEventAnchor());
@@ -827,15 +828,15 @@ TEST_F(TouchSelectionControllerTest, Animation) {
gfx::RectF insertion_rect(5, 5, 0, 10);
bool visible = true;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_FALSE(GetAndResetNeedsAnimate());
visible = false;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_TRUE(GetAndResetNeedsAnimate());
visible = true;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_TRUE(GetAndResetNeedsAnimate());
// If the handles are explicity hidden, no animation should be triggered.
@@ -846,7 +847,7 @@ TEST_F(TouchSelectionControllerTest, Animation) {
SetAnimationEnabled(false);
controller().OnTapEvent();
visible = true;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_FALSE(GetAndResetNeedsAnimate());
}
@@ -857,18 +858,18 @@ TEST_F(TouchSelectionControllerTest, TemporarilyHidden) {
gfx::RectF insertion_rect(5, 5, 0, 10);
bool visible = true;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_FALSE(GetAndResetNeedsAnimate());
controller().SetTemporarilyHidden(true);
EXPECT_TRUE(GetAndResetNeedsAnimate());
visible = false;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_FALSE(GetAndResetNeedsAnimate());
visible = true;
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_TRUE(ChangeInsertion(insertion_rect, visible));
EXPECT_FALSE(GetAndResetNeedsAnimate());
controller().SetTemporarilyHidden(false);
@@ -881,7 +882,7 @@ TEST_F(TouchSelectionControllerTest, SelectionClearOnTap) {
bool visible = true;
controller().OnLongPressEvent();
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_TRUE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_SHOWN));
// Selection should not be cleared if the selection bounds have not changed.
@@ -890,7 +891,7 @@ TEST_F(TouchSelectionControllerTest, SelectionClearOnTap) {
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
controller().OnTapEvent();
- ClearSelection();
+ EXPECT_TRUE(ClearSelection());
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED));
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
}
@@ -901,7 +902,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) {
bool visible = true;
// The selection should not be activated, as it wasn't yet allowed.
- ChangeSelection(start_rect, visible, end_rect, visible);
+ EXPECT_FALSE(ChangeSelection(start_rect, visible, end_rect, visible));
EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
// Now explicitly allow showing from the previously supplied bounds.
@@ -915,7 +916,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) {
EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
// Trying to show from an empty selection will have no result.
- ClearSelection();
+ EXPECT_TRUE(ClearSelection());
EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_CLEARED));
controller().AllowShowingFromCurrentSelection();
EXPECT_THAT(GetAndResetEvents(), IsEmpty());
@@ -925,7 +926,7 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) {
controller().OnSelectionEmpty(false);
controller().HideAndDisallowShowingAutomatically();
gfx::RectF insertion_rect(5, 5, 0, 10);
- ChangeInsertion(insertion_rect, visible);
+ EXPECT_FALSE(ChangeInsertion(insertion_rect, visible));
controller().AllowShowingFromCurrentSelection();
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_SHOWN));
EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
« ui/touch_selection/touch_selection_controller_aura.cc ('K') | « ui/touch_selection/touch_selection_controller_aura_unittest.cc ('k') | ui/touch_selection/touch_selection_menu_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698