Merge 199107 "Pass caret bound to SchedulePaintInRect in local c..."

ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2013 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 "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1088 matching lines @@
   is_cursor_visible_ = !is_cursor_visible_;
   RepaintCursor();
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&NativeTextfieldViews::UpdateCursor,
                  cursor_timer_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kCursorBlinkCycleMs / 2));
 }
 
 void NativeTextfieldViews::RepaintCursor() {
-  gfx::Rect r(GetCaretBounds());
+  gfx::Rect r(GetRenderText()->GetUpdatedCursorBounds());
   r.Inset(-1, -1, -1, -1);
   SchedulePaintInRect(r);
 }
 
 void NativeTextfieldViews::PaintTextAndCursor(gfx::Canvas* canvas) {
   TRACE_EVENT0("views", "NativeTextfieldViews::PaintTextAndCursor");
   canvas->Save();
   GetRenderText()->set_cursor_visible(!is_drop_cursor_visible_ &&
       is_cursor_visible_ && !model_->HasSelection());
   // Draw the text, cursor, and selection.
@@ skipping 332 matching lines @@
 
 void NativeTextfieldViews::PlatformGestureEventHandling(
     const ui::GestureEvent* event) {
 #if defined(OS_WIN) && defined(USE_AURA)
   if (event->type() == ui::ET_GESTURE_TAP_DOWN && !textfield_->read_only())
     base::win::DisplayVirtualKeyboard();
 #endif
 }
 
 }  // namespace views