Move Range code to gfx.

ui/views/touchui/touch_selection_controller_impl_unittest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 182 matching lines @@
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEvent tap(ui::ET_GESTURE_TAP, 0, 0, 0, base::TimeDelta(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f), 0);
   textfield_view_->OnGestureEvent(&tap);
 
   // Test selecting a range.
-  textfield_->SelectRange(ui::Range(3, 7));
+  textfield_->SelectRange(gfx::Range(3, 7));
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test selecting everything.
   textfield_->SelectAll(false);
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test with no selection.
   textfield_->ClearSelection();
   VERIFY_HANDLE_POSITIONS(false);
 
@@ skipping 16 matching lines @@
   ui::GestureEvent tap(ui::ET_GESTURE_TAP, 0, 0, 0, base::TimeDelta(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f), 0);
   textfield_view_->OnGestureEvent(&tap);
 
   // Test cursor at run boundary and with empty selection.
   textfield_->SelectSelectionModel(
       gfx::SelectionModel(3, gfx::CURSOR_BACKWARD));
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test selection range inside one run and starts or ends at run boundary.
-  textfield_->SelectRange(ui::Range(2, 3));
+  textfield_->SelectRange(gfx::Range(2, 3));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(3, 2));
+  textfield_->SelectRange(gfx::Range(3, 2));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(3, 4));
+  textfield_->SelectRange(gfx::Range(3, 4));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(4, 3));
+  textfield_->SelectRange(gfx::Range(4, 3));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(3, 6));
+  textfield_->SelectRange(gfx::Range(3, 6));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(6, 3));
+  textfield_->SelectRange(gfx::Range(6, 3));
   VERIFY_HANDLE_POSITIONS(false);
 
   // Test selection range accross runs.
-  textfield_->SelectRange(ui::Range(0, 6));
+  textfield_->SelectRange(gfx::Range(0, 6));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(6, 0));
+  textfield_->SelectRange(gfx::Range(6, 0));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(1, 4));
+  textfield_->SelectRange(gfx::Range(1, 4));
   VERIFY_HANDLE_POSITIONS(false);
 
-  textfield_->SelectRange(ui::Range(4, 1));
+  textfield_->SelectRange(gfx::Range(4, 1));
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 // Tests if the SelectRect callback is called appropriately when selection
 // handles are moved.
 TEST_F(TouchSelectionControllerImplTest, SelectRectCallbackTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("textfield with selected text"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEvent tap(ui::ET_GESTURE_TAP, 0, 0, 0, base::TimeDelta(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f), 0);
   textfield_view_->OnGestureEvent(&tap);
-  textfield_->SelectRange(ui::Range(3, 7));
+  textfield_->SelectRange(gfx::Range(3, 7));
 
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfie");
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 2 to right by 3 chars.
   const gfx::Font& font = textfield_->GetPrimaryFont();
   int x = font.GetStringWidth(ASCIIToUTF16("ld "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "tfield ");
   VERIFY_HANDLE_POSITIONS(false);
@@ skipping 19 matching lines @@
 
 TEST_F(TouchSelectionControllerImplTest, SelectRectInBidiCallbackTest) {
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05e1\x05e2\x05e3" L"def"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEvent tap(ui::ET_GESTURE_TAP, 0, 0, 0, base::TimeDelta(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f), 0);
   textfield_view_->OnGestureEvent(&tap);
 
   // Select [c] from left to right.
-  textfield_->SelectRange(ui::Range(2, 3));
+  textfield_->SelectRange(gfx::Range(2, 3));
   EXPECT_EQ(WideToUTF16(L"c"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 2 to right by 1 char.
   const gfx::Font& font = textfield_->GetPrimaryFont();
   int x = font.GetStringWidth(WideToUTF16(L"\x05e3"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"c\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 1 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"b"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"bc\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
 
   // Select [c] from right to left.
-  textfield_->SelectRange(ui::Range(3, 2));
+  textfield_->SelectRange(gfx::Range(3, 2));
   EXPECT_EQ(WideToUTF16(L"c"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 1 to right by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"\x05e3"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"c\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
 
   // Drag selection handle 2 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"b"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"bc\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Select [\x5e1] from right to left.
-  textfield_->SelectRange(ui::Range(3, 4));
+  textfield_->SelectRange(gfx::Range(3, 4));
   EXPECT_EQ(WideToUTF16(L"\x05e1"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   /* TODO(xji): for bidi text "abcDEF" whose display is "abcFEDhij", when click
      right of 'D' and select [D] then move the left selection handle to left
      by one character, it should select [ED], instead it selects [F].
      Reason: click right of 'D' and left of 'h' return the same x-axis position,
      pass this position to FindCursorPosition() returns index of 'h'. which
      means the selection start changed from 3 to 6.
      Need further investigation on whether this is a bug in Pango and how to
      work around it.
   // Drag selection handle 2 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"\x05e2"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
   */
 
   // Drag selection handle 1 to right by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"d"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"\x05e2\x05e3" L"d"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
 
   // Select [\x5e1] from left to right.
-  textfield_->SelectRange(ui::Range(4, 3));
+  textfield_->SelectRange(gfx::Range(4, 3));
   EXPECT_EQ(WideToUTF16(L"\x05e1"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   /* TODO(xji): see detail of above commented out test case.
   // Drag selection handle 1 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"\x05e2"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
   */
 
   // Drag selection handle 2 to right by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"d"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"\x05e2\x05e3" L"d"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Select [\x05r3] from right to left.
-  textfield_->SelectRange(ui::Range(5, 6));
+  textfield_->SelectRange(gfx::Range(5, 6));
   EXPECT_EQ(WideToUTF16(L"\x05e3"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 2 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"c"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"c\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 1 to right by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"\x05e2"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"c\x05e1"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
 
   // Select [\x05r3] from left to right.
-  textfield_->SelectRange(ui::Range(6, 5));
+  textfield_->SelectRange(gfx::Range(6, 5));
   EXPECT_EQ(WideToUTF16(L"\x05e3"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Drag selection handle 1 to left by 1 char.
   x = font.GetStringWidth(WideToUTF16(L"c"));
   SimulateSelectionHandleDrag(gfx::Point(-x, 0), 1);
   EXPECT_EQ(WideToUTF16(L"c\x05e1\x05e2"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(true);
 
   // Drag selection handle 2 to right by 1 char.
@@ skipping 11 matching lines @@
   for (int i = 0; i < 10; ++i)
     textfield_text += textfield_text;
   textfield_->SetText(ASCIIToUTF16(textfield_text));
 
   // Tap the textfield to invoke selection.
   ui::GestureEvent tap(ui::ET_GESTURE_TAP, 0, 0, 0, base::TimeDelta(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 1.0f, 0.0f), 0);
   textfield_view_->OnGestureEvent(&tap);
 
   // Select some text such that one handle is hidden.
-  textfield_->SelectRange(ui::Range(10, textfield_text.length()));
+  textfield_->SelectRange(gfx::Range(10, textfield_text.length()));
 
   // Check that one selection handle is hidden.
   EXPECT_FALSE(IsSelectionHandle1Visible());
   EXPECT_TRUE(IsSelectionHandle2Visible());
-  EXPECT_EQ(ui::Range(10, textfield_text.length()),
+  EXPECT_EQ(gfx::Range(10, textfield_text.length()),
             textfield_->GetSelectedRange());
 
   // Drag the visible handle around and make sure the selection end point of the
   // invisible handle does not change.
   size_t visible_handle_position = textfield_->GetSelectedRange().end();
   for (int i = 0; i < 10; ++i) {
     SimulateSelectionHandleDrag(gfx::Point(-10, 0), 2);
     // Make sure that the visible handle is being dragged.
     EXPECT_NE(visible_handle_position, textfield_->GetSelectedRange().end());
     visible_handle_position = textfield_->GetSelectedRange().end();
@@ skipping 22 matching lines @@
   gfx::Point cursor_pos = GetCursorHandlePosition();
   cursor_pos.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
   generator.GestureTapAt(cursor_pos);
   generator.GestureTapAt(cursor_pos);
   EXPECT_TRUE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 }
 #endif
 
 }  // namespace views