Added a system caret used for accessibility on Windows.

content/browser/renderer_host/legacy_render_widget_host_win.cc

 // Copyright (c) 2014 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 "content/browser/renderer_host/legacy_render_widget_host_win.h"
 
 #include <memory>
-#include <utility>
 
 #include "base/command_line.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/browser/accessibility/browser_accessibility_manager_win.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/public/common/content_switches.h"
-#include "ui/accessibility/platform/ax_fake_caret_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/internal_constants.h"
 #include "ui/base/win/window_event_target.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/win/direct_manipulation.h"
 
 namespace content {
 
 // A custom MSAA object id used to determine if a screen reader or some
@@ skipping 50 matching lines @@
 void LegacyRenderWidgetHostHWND::SetBounds(const gfx::Rect& bounds) {
   gfx::Rect bounds_in_pixel = display::win::ScreenWin::DIPToClientRect(hwnd(),
                                                                        bounds);
   ::SetWindowPos(hwnd(), NULL, bounds_in_pixel.x(), bounds_in_pixel.y(),
                  bounds_in_pixel.width(), bounds_in_pixel.height(),
                  SWP_NOREDRAW);
   if (direct_manipulation_helper_)
     direct_manipulation_helper_->SetBounds(bounds_in_pixel);
 }
 
-void LegacyRenderWidgetHostHWND::MoveCaretTo(const gfx::Rect& bounds) {
-  DCHECK(ax_fake_caret_);
-  ax_fake_caret_->MoveCaretTo(bounds);
-}
-
 void LegacyRenderWidgetHostHWND::OnFinalMessage(HWND hwnd) {
   if (host_) {
     host_->OnLegacyWindowDestroyed();
     host_ = NULL;
   }
 
   // Re-enable flicks for just a moment
   base::win::EnableFlicks(hwnd);
 
   delete this;
 }
 
 LegacyRenderWidgetHostHWND::LegacyRenderWidgetHostHWND(HWND parent)
-    : mouse_tracking_enabled_(false), host_(nullptr) {
+    : mouse_tracking_enabled_(false), host_(NULL) {
   RECT rect = {0};
   Base::Create(parent, rect, L"Chrome Legacy Window",
                WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
                WS_EX_TRANSPARENT);
-  // We create the fake caret regardless of accessibility mode since not all
-  // assistive software that makes use of a fake caret is classified as a screen
-  // reader, e.g. the built-in Windows Magnifier.
-  ax_fake_caret_ = std::make_unique<ui::AXFakeCaretWin>(hwnd());
 }
 
 LegacyRenderWidgetHostHWND::~LegacyRenderWidgetHostHWND() {
   DCHECK(!::IsWindow(hwnd()));
 }
 
 bool LegacyRenderWidgetHostHWND::Init() {
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     RegisterTouchWindow(hwnd(), TWF_WANTPALM);
 
@@ skipping 46 matching lines @@
 
   if (kIdScreenReaderHoneyPot == obj_id) {
     // When an MSAA client has responded to our fake event on this id,
     // enable basic accessibility support. (Full screen reader support is
     // detected later when specific more advanced APIs are accessed.)
     BrowserAccessibilityStateImpl::GetInstance()->AddAccessibilityModeFlags(
         AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents);
     return static_cast<LRESULT>(0L);
   }
 
-  if (!host_)
+  if (static_cast<DWORD>(OBJID_CLIENT) != obj_id || !host_)
     return static_cast<LRESULT>(0L);
 
-  if (static_cast<DWORD>(OBJID_CLIENT) == obj_id) {
-    RenderWidgetHostImpl* rwhi =
-        RenderWidgetHostImpl::From(host_->GetRenderWidgetHost());
-    if (!rwhi)
-      return static_cast<LRESULT>(0L);
+  RenderWidgetHostImpl* rwhi =
+      RenderWidgetHostImpl::From(host_->GetRenderWidgetHost());
+  if (!rwhi)
+    return static_cast<LRESULT>(0L);
 
-    BrowserAccessibilityManagerWin* manager =
-        static_cast<BrowserAccessibilityManagerWin*>(
-            rwhi->GetRootBrowserAccessibilityManager());
-    if (!manager)
-      return static_cast<LRESULT>(0L);
+  BrowserAccessibilityManagerWin* manager =
+      static_cast<BrowserAccessibilityManagerWin*>(
+          rwhi->GetRootBrowserAccessibilityManager());
+  if (!manager)
+    return static_cast<LRESULT>(0L);
 
-    base::win::ScopedComPtr<IAccessible> root(
-        ToBrowserAccessibilityWin(manager->GetRoot()));
-    return LresultFromObject(IID_IAccessible, w_param,
-                             static_cast<IAccessible*>(root.Detach()));
-  }
-
-  if (static_cast<DWORD>(OBJID_CARET) == obj_id && host_->HasFocus()) {
-    DCHECK(ax_fake_caret_);
-    base::win::ScopedComPtr<IAccessible> fake_caret_accessible =
-        ax_fake_caret_->GetCaret();
-    return LresultFromObject(IID_IAccessible, w_param,
-                             fake_caret_accessible.Detach());
-  }
-
-  return static_cast<LRESULT>(0L);
+  base::win::ScopedComPtr<IAccessible> root(
+      ToBrowserAccessibilityWin(manager->GetRoot()));
+  return LresultFromObject(IID_IAccessible, w_param,
+                           static_cast<IAccessible*>(root.Detach()));
 }
 
 // We send keyboard/mouse/touch messages to the parent window via SendMessage.
 // While this works, this has the side effect of converting input messages into
 // sent messages which changes their priority and could technically result
 // in these messages starving other messages in the queue. Additionally
 // keyboard/mouse hooks would not see these messages. The alternative approach
 // is to set and release capture as needed on the parent to ensure that it
 // receives all mouse events. However that was shelved due to possible issues
 // with capture changes.
@@ skipping 220 matching lines @@
       direct_manipulation_helper_->Activate(hwnd());
     } else if (window_pos->flags & SWP_HIDEWINDOW) {
       direct_manipulation_helper_->Deactivate(hwnd());
     }
   }
   SetMsgHandled(FALSE);
   return 0;
 }
 
 }  // namespace content