Make NativeTextfieldViews update the win system caret.

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 33 matching lines @@
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 #if defined(OS_WIN) && defined(USE_AURA)
 #include "base/win/win_util.h"
 #endif
 
+#if defined(OS_WIN)
+#include "ui/base/win/accessibility_misc_utils.h"
+#include "ui/views/win/hwnd_util.h"
+#endif
+
 namespace {
 
 void ConvertRectToScreen(const views::View* src, gfx::Rect* r) {
   DCHECK(src);
 
   gfx::Point new_origin = r->origin();
   views::View::ConvertPointToScreen(src, &new_origin);
   r->set_origin(new_origin);
 }
 
@@ skipping 626 matching lines @@
 void NativeTextfieldViews::HandleBlur() {
   GetRenderText()->set_focused(false);
   GetInputMethod()->OnBlur();
   // Stop blinking cursor.
   cursor_timer_.InvalidateWeakPtrs();
   if (is_cursor_visible_) {
     is_cursor_visible_ = false;
     RepaintCursor();
   }
 
+  PlatformHideSystemCaret();
+
   touch_selection_controller_.reset();
 }
 
 ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
   return textfield_->read_only() ? NULL : this;
 }
 
 void NativeTextfieldViews::ClearEditHistory() {
   model_->ClearEditHistory();
 }
@@ skipping 437 matching lines @@
         base::Bind(&NativeTextfieldViews::UpdateCursor,
                    cursor_timer_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(caret_blink_ms));
   }
 }
 
 void NativeTextfieldViews::RepaintCursor() {
   gfx::Rect r(GetRenderText()->GetUpdatedCursorBounds());
   r.Inset(-1, -1, -1, -1);
   SchedulePaintInRect(r);
+  PlatformUpdateSystemCaret();
 }
 
 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.
   GetRenderText()->Draw(canvas);
 
@@ skipping 352 matching lines @@
 
   if (index != -1) {
     obscured_reveal_timer_.Start(
         FROM_HERE,
         duration,
         base::Bind(&NativeTextfieldViews::RevealObscuredChar,
                    base::Unretained(this), -1, base::TimeDelta()));
   }
 }
 
+
+void NativeTextfieldViews::PlatformUpdateSystemCaret() {
+#if defined(OS_WIN)
+  if (!GetRenderText()->focused())
+    return;
+
+  // Move an invisible system caret to this location for accessibility.
+  if (!is_drop_cursor_visible_) {
+    gfx::Rect caret_rect(GetRenderText()->GetUpdatedCursorBounds());
+    caret_rect = ConvertRectToWidget(caret_rect);
+    caret_rect += GetWidget()->GetClientAreaBoundsInScreen().OffsetFromOrigin();
+    if (caret_rect != last_caret_rect_) {
+      base::win::SetInvisibleSystemCaretRect(HWNDForView(this), caret_rect);
+      last_caret_rect_ = caret_rect;
+    }
+  } else {
+    DestroyCaret();
+    last_caret_rect_ = gfx::Rect();
+  }
+#endif
+}
+
+void NativeTextfieldViews::PlatformHideSystemCaret() {
+#if defined(OS_WIN)
+  DestroyCaret();
+  last_caret_rect_ = gfx::Rect();
+#endif
+}
+
 }  // namespace views