Add support for faster, more limited accessibility modes.

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 "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/browser/browser_accessibility_state.h"
 #include "content/public/common/content_switches.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 {
 
@@ skipping 85 matching lines @@
 
 bool LegacyRenderWidgetHostHWND::Init() {
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     RegisterTouchWindow(hwnd(), TWF_WANTPALM);
 
   HRESULT hr = ::CreateStdAccessibleObject(
       hwnd(), OBJID_WINDOW, IID_IAccessible,
       reinterpret_cast<void **>(window_accessible_.Receive()));
   DCHECK(SUCCEEDED(hr));
 
-  if (!BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
+  AccessibilityMode mode =
+      BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();
+  if (!(mode & ACCESSIBILITY_MODE_FLAG_NATIVE_APIS)) {
     // Attempt to detect screen readers or other clients who want full
     // accessibility support, by seeing if they respond to this event.
     NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd(), kIdScreenReaderHoneyPot,
                    CHILDID_SELF);
   }
 
   // Direct Manipulation is enabled on Windows 10+. The CreateInstance function
   // returns NULL if Direct Manipulation is not available.
   direct_manipulation_helper_ =
       gfx::win::DirectManipulationHelper::CreateInstance();
@@ skipping 21 matching lines @@
 
 LRESULT LegacyRenderWidgetHostHWND::OnGetObject(UINT message,
                                                 WPARAM w_param,
                                                 LPARAM l_param) {
   // Only the lower 32 bits of l_param are valid when checking the object id
   // because it sometimes gets sign-extended incorrectly (but not always).
   DWORD obj_id = static_cast<DWORD>(static_cast<DWORD_PTR>(l_param));
 
   if (kIdScreenReaderHoneyPot == obj_id) {
     // When an MSAA client has responded to our fake event on this id,
-    // enable screen reader support.
-    BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
+    // enable basic accessibility support. (Full screen reader support is
+    // detected later when specific more advanced APIs are accessed.)
+    BrowserAccessibilityStateImpl::GetInstance()->AddAccessibilityModeFlags(
+        ACCESSIBILITY_MODE_FLAG_NATIVE_APIS |
+        ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS);
     return static_cast<LRESULT>(0L);
   }
 
   if (static_cast<DWORD>(OBJID_CLIENT) != obj_id || !host_)
     return static_cast<LRESULT>(0L);
 
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
       host_->GetRenderWidgetHost());
   if (!rwhi)
     return static_cast<LRESULT>(0L);
@@ skipping 228 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