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 625 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();
   }
+#if defined(OS_WIN)
+  DestroyCaret();
+#endif
 
   touch_selection_controller_.reset();
 }
 
 ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
   return textfield_->read_only() ? NULL : this;
 }
 
 void NativeTextfieldViews::ClearEditHistory() {
   model_->ClearEditHistory();
@@ skipping 648 matching lines @@
 
   context_menu_delegate_->BuildMenu(context_menu_runner_->GetMenu());
 }
 
 void NativeTextfieldViews::OnTextInputTypeChanged() {
   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnTextInputTypeChanged(textfield_);
 }
 
 void NativeTextfieldViews::OnCaretBoundsChanged() {

[sky, 2013/11/07 01:34:42]

I'm not sure if this is invoked if the bounds of the TextField itself change
relative to the root. Do you care?

[dmazzoni, 2013/11/07 20:07:14]

I moved it to RepaintCursor, that should update every time it blinks. I added a
cache of the last rect so it doesn't need to update if it hasn't actually moved.

   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnCaretBoundsChanged(textfield_);
 
   // Notify selection controller
   if (touch_selection_controller_.get())
     touch_selection_controller_->SelectionChanged();
+
+#if defined(OS_WIN)
+  // Move an invisible system caret to this location for accessibility.
+  if (GetRenderText()->focused() &&
+      !model_->HasSelection() &&

[sky, 2013/11/07 01:34:42]

How come you don't do this when there is a selection? Isn't there still a caret
at one end of the selection? And similarly if the drop cursor is visible are you
sure you don't want to update the caret to that position?

[dmazzoni, 2013/11/07 20:07:14]

You're right - I thought we didn't need to update it because it wasn't visible,
but it looks like accessibility apps track the caret even when it's at one end
of a selection. Done.
I still lean towards no, it's a placeholder and not the real caret - and I don't
think it'd be an accessibility issue since it'd always be right under the mouse
cursor.

+      !is_drop_cursor_visible_) {
+    gfx::Rect caret_rect(GetRenderText()->GetUpdatedCursorBounds());
+    caret_rect = ConvertRectToWidget(caret_rect);
+    caret_rect += GetWidget()->GetClientAreaBoundsInScreen().OffsetFromOrigin();
+    base::win::SetInvisibleSystemCaretRect(HWNDForView(this), caret_rect);
+  } else {
+    DestroyCaret();
+  }
+#endif
 }
 
 void NativeTextfieldViews::OnBeforeUserAction() {
   TextfieldController* controller = textfield_->GetController();
   if (controller)
     controller->OnBeforeUserAction(textfield_);
 }
 
 void NativeTextfieldViews::OnAfterUserAction() {
   TextfieldController* controller = textfield_->GetController();
@@ skipping 135 matching lines @@
   if (index != -1) {
     obscured_reveal_timer_.Start(
         FROM_HERE,
         duration,
         base::Bind(&NativeTextfieldViews::RevealObscuredChar,
                    base::Unretained(this), -1, base::TimeDelta()));
   }
 }
 
 }  // namespace views