Fix RenderText cached bounds and offset logic; update clients.

views/controls/textfield/native_textfield_views.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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 589 matching lines @@
   SchedulePaint();
 }
 
 void NativeTextfieldViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Set the RenderText display area.
   gfx::Insets insets = GetInsets();
   gfx::Rect display_rect(insets.left(),
                          insets.top(),
                          width() - insets.width(),
                          height() - insets.height());
-  GetRenderText()->set_display_rect(display_rect);
+  GetRenderText()->SetDisplayRect(display_rect);
   OnCaretBoundsChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, TextInputClient implementation, private:
 
 void NativeTextfieldViews::SetCompositionText(
     const ui::CompositionText& composition) {
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return;
@@ skipping 65 matching lines @@
 
 ui::TextInputType NativeTextfieldViews::GetTextInputType() {
   if (textfield_->read_only() || !textfield_->IsEnabled())
     return ui::TEXT_INPUT_TYPE_NONE;
   else if (textfield_->IsPassword())
     return ui::TEXT_INPUT_TYPE_PASSWORD;
   return ui::TEXT_INPUT_TYPE_TEXT;
 }
 
 gfx::Rect NativeTextfieldViews::GetCaretBounds() {
-  return GetRenderText()->CursorBounds();
+  return GetRenderText()->GetUpdatedCursorBounds();
 }
 
 bool NativeTextfieldViews::HasCompositionText() {
   return model_->HasCompositionText();
 }
 
 bool NativeTextfieldViews::GetTextRange(ui::Range* range) {
   // We don't allow the input method to retrieve or delete content from a
   // password box.
   if (GetTextInputType() != ui::TEXT_INPUT_TYPE_TEXT)
@@ skipping 276 matching lines @@
 
   // Notify selection controller
   if (!touch_selection_controller_.get())
     return;
   gfx::RenderText* render_text = GetRenderText();
   const gfx::SelectionModel& sel = render_text->selection_model();
   gfx::SelectionModel start_sel(sel.selection_start(), sel.selection_start(),
       sel.selection_start(), gfx::SelectionModel::LEADING);
   gfx::Rect start_cursor = render_text->GetCursorBounds(start_sel, false);
   gfx::Rect end_cursor = render_text->GetCursorBounds(sel, 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() - start_cursor.height()) / 2;
-  gfx::Point start(start_cursor.x() + total_offset_x,
-                   start_cursor.bottom() + total_offset_y);
-  gfx::Point end(end_cursor.x() + total_offset_x,
-                 end_cursor.bottom() + total_offset_y);
+  gfx::Point start(start_cursor.x(), start_cursor.bottom());
+  gfx::Point end(end_cursor.x(), end_cursor.bottom());
   touch_selection_controller_->SelectionChanged(start, end);
 }
 
 void NativeTextfieldViews::OnBeforeUserAction() {
   TextfieldController* controller = textfield_->GetController();
   if (controller)
     controller->OnBeforeUserAction(textfield_);
 }
 
 void NativeTextfieldViews::OnAfterUserAction() {
@@ skipping 20 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views