Fix RenderText cached bounds and offset logic; update clients.

views/touchui/touch_selection_controller_impl_unittest.cc

 // Copyright (c) 2011 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/utf_string_conversions.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 20 matching lines @@
     Widget::SetPureViews(false);
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
   void CreateTextfield() {
     textfield_ = new Textfield();
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-    params.bounds = gfx::Rect(0, 0, 100, 100);
+    params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(textfield_);
 
     textfield_view_ = static_cast<NativeTextfieldViews*>(
         textfield_->GetNativeWrapperForTesting());
     textfield_view_->SetBoundsRect(params.bounds);
     textfield_->set_id(1);
 
     DCHECK(textfield_view_);
     textfield_->RequestFocus();
   }
 
  protected:
   gfx::Point GetCursorPosition(int cursor_pos) {
     gfx::RenderText* render_text = textfield_view_->GetRenderText();
     gfx::Rect cursor_bounds = render_text->GetCursorBounds(
         gfx::SelectionModel(cursor_pos), false);
-    gfx::Rect display_rect = render_text->display_rect();
-    int total_offset_x = display_rect.x() + render_text->display_offset().x();
-    int total_offset_y = display_rect.y() + render_text->display_offset().y() +
-                         (display_rect.height() - cursor_bounds.height()) / 2;
-    return gfx::Point(cursor_bounds.x() + total_offset_x,
-                      cursor_bounds.bottom() + total_offset_y);
+    return gfx::Point(cursor_bounds.x(), cursor_bounds.bottom());
   }
 
   TouchSelectionControllerImpl* GetSelectionController() {
     return static_cast<TouchSelectionControllerImpl*>(
         textfield_view_->touch_selection_controller_.get());
   }
 
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
     // Do the work of OnMousePressed().
@@ skipping 103 matching lines @@
   VerifySelectionHandlePositions(true);
 
   // Drag selection handle 2 across selection handle 1.
   x = textfield_->font().GetStringWidth(ASCIIToUTF16("with selected "));
   SimulateSelectionHandleDrag(gfx::Point(x, 0), 2);
   EXPECT_EQ(UTF16ToUTF8(textfield_->GetSelectedText()), "selected ");
   VerifySelectionHandlePositions(false);
 }
 
 }  // namespace views