Revert of Forward BrowserAccessibility get_accState to AXPlatformNode.

ui/accessibility/platform/ax_platform_node_win.cc

 // Copyright 2015 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 <atlbase.h>
 #include <atlcom.h>
 #include <limits.h>
 #include <oleacc.h>
 #include <stdint.h>
 
@@ skipping 1420 matching lines @@
   if (state & (1 << ui::AX_STATE_COLLAPSED))
     msaa_state |= STATE_SYSTEM_COLLAPSED;
   if (state & (1 << ui::AX_STATE_DEFAULT))
     msaa_state |= STATE_SYSTEM_DEFAULT;
   if (state & (1 << ui::AX_STATE_EXPANDED))
     msaa_state |= STATE_SYSTEM_EXPANDED;
   if (state & (1 << ui::AX_STATE_FOCUSABLE))
     msaa_state |= STATE_SYSTEM_FOCUSABLE;
   if (state & (1 << ui::AX_STATE_HASPOPUP))
     msaa_state |= STATE_SYSTEM_HASPOPUP;
-
+  if (state & (1 << ui::AX_STATE_HOVERED))
+    msaa_state |= STATE_SYSTEM_HOTTRACKED;
   if (state & (1 << ui::AX_STATE_INVISIBLE) ||
       GetData().role == ui::AX_ROLE_IGNORED) {
     msaa_state |= STATE_SYSTEM_INVISIBLE;
   }
   if (state & (1 << ui::AX_STATE_LINKED))
     msaa_state |= STATE_SYSTEM_LINKED;
   if (state & (1 << ui::AX_STATE_OFFSCREEN))
     msaa_state |= STATE_SYSTEM_OFFSCREEN;
   if (state & (1 << ui::AX_STATE_PROTECTED))
     msaa_state |= STATE_SYSTEM_PROTECTED;
   if (state & (1 << ui::AX_STATE_READ_ONLY))
     msaa_state |= STATE_SYSTEM_READONLY;
   if (state & (1 << ui::AX_STATE_SELECTABLE))
     msaa_state |= STATE_SYSTEM_SELECTABLE;
   if (state & (1 << ui::AX_STATE_SELECTED))
     msaa_state |= STATE_SYSTEM_SELECTED;
   if (state & (1 << ui::AX_STATE_DISABLED))
     msaa_state |= STATE_SYSTEM_UNAVAILABLE;
-  if (state & (1 << ui::AX_STATE_BUSY))
-    msaa_state |= STATE_SYSTEM_BUSY;
-  if (state & (1 << ui::AX_STATE_VISITED))
-    msaa_state |= STATE_SYSTEM_TRAVERSED;
-
-  if (state & (1 << ui::AX_STATE_MULTISELECTABLE)) {
-    msaa_state |= STATE_SYSTEM_EXTSELECTABLE;
-    msaa_state |= STATE_SYSTEM_MULTISELECTABLE;
-  }
-
-  // Expose whether or not the mouse is over an element, but suppress
-  // this for tests because it can make the test results flaky depending
-  // on the position of the mouse.
-  if (delegate_->ShouldIgnoreHoveredStateForTesting()) {
-    if (state & (1 << ui::AX_STATE_HOVERED))
-      msaa_state |= STATE_SYSTEM_HOTTRACKED;
-  }
 
   // Checked state
   const auto checked_state = static_cast<ui::AXCheckedState>(
       GetIntAttribute(ui::AX_ATTR_CHECKED_STATE));
   switch (checked_state) {
     case ui::AX_CHECKED_STATE_TRUE:
       msaa_state |= data.role == ui::AX_ROLE_TOGGLE_BUTTON
                         ? STATE_SYSTEM_PRESSED
                         : STATE_SYSTEM_CHECKED;
       break;
@@ skipping 12 matching lines @@
   // menu bars, when visible.
   //
   // TODO(dmazzoni): this should probably check if focus is actually inside
   // the menu bar, but we don't currently track focus inside menu pop-ups,
   // and Chrome only has one menu visible at a time so this works for now.
   if (data.role == ui::AX_ROLE_MENU_BAR &&
       !(state & (1 << ui::AX_STATE_INVISIBLE))) {
     msaa_state |= STATE_SYSTEM_FOCUSED;
   }
 
-  switch (GetData().role) {
-    case ui::AX_ROLE_ARTICLE:
-    case ui::AX_ROLE_BUSY_INDICATOR:
-    case ui::AX_ROLE_DEFINITION:
-    case ui::AX_ROLE_DESCRIPTION_LIST:
-    case ui::AX_ROLE_DESCRIPTION_LIST_TERM:
-    case ui::AX_ROLE_IFRAME:
-    case ui::AX_ROLE_IMAGE:
-    case ui::AX_ROLE_IMAGE_MAP:
-    case ui::AX_ROLE_LIST:
-    case ui::AX_ROLE_LIST_ITEM:
-    case ui::AX_ROLE_PROGRESS_INDICATOR:
-    case ui::AX_ROLE_RULER:
-    case ui::AX_ROLE_SCROLL_AREA:
-    case ui::AX_ROLE_TABLE_HEADER_CONTAINER:
-    case ui::AX_ROLE_TERM:
-    case ui::AX_ROLE_TIMER:
-    case ui::AX_ROLE_TOOLBAR:
-    case ui::AX_ROLE_TOOLTIP:
-      msaa_state |= STATE_SYSTEM_READONLY;
-      break;
-
-    case ui::AX_ROLE_DOCUMENT:
-    case ui::AX_ROLE_ROOT_WEB_AREA:
-    case ui::AX_ROLE_WEB_AREA:
-      msaa_state |= STATE_SYSTEM_READONLY;
-      msaa_state |= STATE_SYSTEM_FOCUSABLE;
-      break;
-
-    case ui::AX_ROLE_GRID:
-      // TODO(aleventhal) this changed between ARIA 1.0 and 1.1,
-      // need to determine whether grids/treegrids should really be readonly
-      // or editable by default
-      // msaa_state |= STATE_SYSTEM_READONLY;
-      break;
-
-    case ui::AX_ROLE_IMAGE_MAP_LINK:
-      msaa_state |= STATE_SYSTEM_LINKED;
-      msaa_state |= STATE_SYSTEM_READONLY;
-      break;
-
-    case ui::AX_ROLE_LINK:
-      msaa_state |= STATE_SYSTEM_LINKED;
-      break;
-
-    case ui::AX_ROLE_LIST_BOX_OPTION:
-      if (msaa_state & STATE_SYSTEM_SELECTABLE) {
-        msaa_state |= STATE_SYSTEM_FOCUSABLE;
-      }
-      break;
-
-    case ui::AX_ROLE_MENU_LIST_OPTION:
-      if (msaa_state & STATE_SYSTEM_SELECTABLE) {
-        msaa_state |= STATE_SYSTEM_FOCUSABLE;
-      }
-      break;
-
-    case ui::AX_ROLE_TEXT_FIELD:
-    case ui::AX_ROLE_SEARCH_BOX:
-      if (state & (1 << ui::AX_STATE_READ_ONLY))
-        msaa_state |= STATE_SYSTEM_READONLY;
-      break;
-    default:
-      break;
-  }
-
-  // Compute the final value of READONLY for MSAA.
-  //
-  // We always set the READONLY state for elements that have the
-  // aria-readonly attribute and for a few roles (in the switch above),
-  // including read-only text fields.
-  // The majority of focusable controls should not have the read-only state set.
-  if (state & (1 << ui::AX_STATE_FOCUSABLE) &&
-      GetData().role != ROLE_SYSTEM_DOCUMENT &&
-      GetData().role != ROLE_SYSTEM_TEXT) {
-    msaa_state &= ~(STATE_SYSTEM_READONLY);
-  }
-  if (!(state & (1 << ui::AX_STATE_READ_ONLY)))
-    msaa_state &= ~(STATE_SYSTEM_READONLY);
-
-  if (GetData().GetBoolAttribute(ui::AX_ATTR_ARIA_READONLY))
-    msaa_state |= STATE_SYSTEM_READONLY;
-
   return msaa_state;
 }
 
 int AXPlatformNodeWin::MSAAEvent(ui::AXEvent event) {
   switch (event) {
     case ui::AX_EVENT_ALERT:
       return EVENT_SYSTEM_ALERT;
     case ui::AX_EVENT_FOCUS:
       return EVENT_OBJECT_FOCUS;
     case ui::AX_EVENT_MENU_START:
@@ skipping 113 matching lines @@
 
   AXPlatformNodeBase* base =
       FromNativeViewAccessible(node->GetNativeViewAccessible());
   if (base && !IsDescendant(base))
     base = nullptr;
 
   return static_cast<AXPlatformNodeWin*>(base);
 }
 
 }  // namespace ui