Revert of Merge NativeTextfieldViews into views::Textfield.

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"
-#include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #endif
 
@@ skipping 19 matching lines @@
 }
 }  // namespace
 
 namespace views {
 
 class TouchSelectionControllerImplTest : public ViewsTestBase {
  public:
   TouchSelectionControllerImplTest()
       : widget_(NULL),
         textfield_(NULL),
+        textfield_view_(NULL),
         views_tsc_factory_(new ViewsTouchSelectionControllerFactory) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableTouchEditing);
     ui::TouchSelectionControllerFactory::SetInstance(views_tsc_factory_.get());
   }
 
   virtual ~TouchSelectionControllerImplTest() {
     ui::TouchSelectionControllerFactory::SetInstance(NULL);
   }
 
   virtual void TearDown() {
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
   void CreateTextfield() {
     textfield_ = new Textfield();
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(textfield_);
 
+    textfield_view_ = textfield_->GetTextfieldViewForTesting();
     textfield_->SetBoundsRect(params.bounds);
+    textfield_view_->SetBoundsRect(params.bounds);
     textfield_->set_id(1);
     widget_->Show();
 
+    DCHECK(textfield_view_);
     textfield_->RequestFocus();
   }
 
  protected:
   gfx::Point GetCursorPosition(const gfx::SelectionModel& sel) {
-    gfx::RenderText* render_text = textfield_->GetRenderText();
+    gfx::RenderText* render_text = textfield_view_->GetRenderText();
     gfx::Rect cursor_bounds = render_text->GetCursorBounds(sel, true);
     return gfx::Point(cursor_bounds.x(), cursor_bounds.y());
   }
 
   TouchSelectionControllerImpl* GetSelectionController() {
     return static_cast<TouchSelectionControllerImpl*>(
-        textfield_->touch_selection_controller_.get());
+        textfield_view_->touch_selection_controller_.get());
   }
 
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
     // Do the work of OnMousePressed().
     if (selection_handle == 1)
       controller->SetDraggingHandle(controller->selection_handle_1_.get());
     else
       controller->SetDraggingHandle(controller->selection_handle_2_.get());
 
@@ skipping 24 matching lines @@
 
   bool IsSelectionHandle2Visible() {
     return GetSelectionController()->IsSelectionHandle2Visible();
   }
 
   bool IsCursorHandleVisible() {
     return GetSelectionController()->IsCursorHandleVisible();
   }
 
   gfx::RenderText* GetRenderText() {
-    return textfield_->GetRenderText();
+    return textfield_view_->GetRenderText();
   }
 
   Widget* widget_;
 
   Textfield* textfield_;
+  NativeTextfieldViews* textfield_view_;
   scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // If textfield has selection, this macro verifies that the selection handles
 // are visible and at the correct positions (at the end points of selection).
 // |cursor_at_selection_handle_1| is used to decide whether selection
 // handle 1's position is matched against the start of selection or the end.
 #define VERIFY_HANDLE_POSITIONS(cursor_at_selection_handle_1)                  \
 {                                                                              \
-    gfx::SelectionModel sel = textfield_->GetSelectionModel();                 \
+    gfx::SelectionModel sel = textfield_view_->GetSelectionModel();            \
     if (textfield_->HasSelection()) {                                          \
       EXPECT_TRUE(IsSelectionHandle1Visible());                                \
       EXPECT_TRUE(IsSelectionHandle2Visible());                                \
       EXPECT_FALSE(IsCursorHandleVisible());                                   \
       gfx::SelectionModel sel_start = GetRenderText()->                        \
                                       GetSelectionModelForSelectionStart();    \
       gfx::Point selection_start = GetCursorPosition(sel_start);               \
       gfx::Point selection_end = GetCursorPosition(sel);                       \
       gfx::Point sh1 = GetSelectionHandle1Position();                          \
       gfx::Point sh2 = GetSelectionHandle2Position();                          \
@@ skipping 18 matching lines @@
 }
 
 // Tests that the selection handles are placed appropriately when selection in
 // 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_->OnGestureEvent(&tap);
+  textfield_view_->OnGestureEvent(&tap);
 
   // Test selecting a range.
   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);
 
   // Test with lost focus.
   widget_->GetFocusManager()->ClearFocus();
   EXPECT_FALSE(GetSelectionController());
 
   // Test with focus re-gained.
   widget_->GetFocusManager()->SetFocusedView(textfield_);
   EXPECT_FALSE(GetSelectionController());
-  textfield_->OnGestureEvent(&tap);
+  textfield_view_->OnGestureEvent(&tap);
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 // Tests that the selection handles are placed appropriately in bidi text.
 TEST_F(TouchSelectionControllerImplTest, SelectionInBidiTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
   // 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_->OnGestureEvent(&tap);
+  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(gfx::Range(2, 3));
   VERIFY_HANDLE_POSITIONS(false);
 
@@ skipping 27 matching lines @@
 }
 
 // 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_->OnGestureEvent(&tap);
+  textfield_view_->OnGestureEvent(&tap);
   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::FontList& font_list = textfield_->GetFontList();
-  int x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("ld "), font_list);
+  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);
 
   // Drag selection handle 1 to the left by a large amount (selection should
   // just stick to the beginning of the textfield).
   SimulateSelectionHandleDrag(gfx::Point(-50, 0), 1);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "textfield ");
   VERIFY_HANDLE_POSITIONS(true);
 
   // Drag selection handle 1 across selection handle 2.
-  x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("textfield with "), font_list);
+  x = font.GetStringWidth(ASCIIToUTF16("textfield with "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 1);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "with ");
   VERIFY_HANDLE_POSITIONS(true);
 
   // Drag selection handle 2 across selection handle 1.
-  x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("with selected "), font_list);
+  x = font.GetStringWidth(ASCIIToUTF16("with selected "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "selected ");
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 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_->OnGestureEvent(&tap);
+  textfield_view_->OnGestureEvent(&tap);
 
   // Select [c] from left to right.
   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::FontList& font_list = textfield_->GetFontList();
-  int x = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e3"), font_list);
+  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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"b"), font_list);
+  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(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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e3"), font_list);
+  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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"b"), font_list);
+  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(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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e2"), font_list);
+  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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"d"), font_list);
+  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(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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e2"), font_list);
+  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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"d"), font_list);
+  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(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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"c"), font_list);
+  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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e2"), font_list);
+  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(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 = gfx::Canvas::GetStringWidth(WideToUTF16(L"c"), font_list);
+  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.
-  x = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e2"), font_list);
+  x = font.GetStringWidth(WideToUTF16(L"\x05e2"));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"c\x05e1"), textfield_->GetSelectedText());
   VERIFY_HANDLE_POSITIONS(false);
 }
 
 TEST_F(TouchSelectionControllerImplTest,
        HiddenSelectionHandleRetainsCursorPosition) {
   // Create a textfield with lots of text in it.
   CreateTextfield();
   std::string textfield_text("some text");
   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_->OnGestureEvent(&tap);
+  textfield_view_->OnGestureEvent(&tap);
 
   // Select some text such that one handle is hidden.
   textfield_->SelectRange(gfx::Range(10, textfield_text.length()));
 
   // Check that one selection handle is hidden.
   EXPECT_FALSE(IsSelectionHandle1Visible());
   EXPECT_TRUE(IsSelectionHandle2Visible());
   EXPECT_EQ(gfx::Range(10, textfield_text.length()),
             textfield_->GetSelectedRange());
 
@@ skipping 30 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