Use MSAA_Role directly from BrowserAccessibility.

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 1171 matching lines @@
   }
 
   *object = nullptr;
   return E_FAIL;
 }
 
 //
 // Private member functions.
 //
 int AXPlatformNodeWin::MSAARole() {
+  // If this is a web area for a presentational iframe, give it a role of
+  // something other than DOCUMENT so that the fact that it's a separate doc
+  // is not exposed to AT.
+  if (IsWebAreaForPresentationalIframe()) {
+    return ROLE_SYSTEM_GROUPING;
+  }
+
   switch (GetData().role) {
     case ui::AX_ROLE_ALERT:
       return ROLE_SYSTEM_ALERT;
 
     case ui::AX_ROLE_ALERT_DIALOG:
       return ROLE_SYSTEM_DIALOG;
 
     case ui::AX_ROLE_ANCHOR:
       return ROLE_SYSTEM_LINK;
 
@@ skipping 158 matching lines @@
 
     case ui::AX_ROLE_MENU_ITEM_RADIO:
       return ROLE_SYSTEM_MENUITEM;
 
     case ui::AX_ROLE_MENU_LIST_POPUP:
       return ROLE_SYSTEM_LIST;
 
     case ui::AX_ROLE_MENU_LIST_OPTION:
       return ROLE_SYSTEM_LISTITEM;
 
+    case ui::AX_ROLE_METER:
+      return ROLE_SYSTEM_PROGRESSBAR;
+
     case ui::AX_ROLE_NAVIGATION:
       return ROLE_SYSTEM_GROUPING;
 
     case ui::AX_ROLE_NOTE:
       return ROLE_SYSTEM_GROUPING;
 
     case ui::AX_ROLE_OUTLINE:
       return ROLE_SYSTEM_OUTLINE;
 
     case ui::AX_ROLE_POP_UP_BUTTON: {
@@ skipping 17 matching lines @@
     case ui::AX_ROLE_REGION: {
       std::string html_tag = GetData().GetStringAttribute(ui::AX_ATTR_HTML_TAG);
       if (html_tag == "section")
         return ROLE_SYSTEM_GROUPING;
       return ROLE_SYSTEM_PANE;
     }
 
     case ui::AX_ROLE_ROW: {
       // Role changes depending on whether row is inside a treegrid
       // https://www.w3.org/TR/core-aam-1.1/#role-map-row
-      auto* container = FromNativeViewAccessible(GetParent());
-      if (container && container->GetData().role == ui::AX_ROLE_GROUP) {
-        // If parent was a rowgroup, we need to look at the grandparent
-        container = FromNativeViewAccessible(container->GetParent());
-      }
-
-      if (!container)
-        return ROLE_SYSTEM_ROW;
-
-      return ROLE_SYSTEM_OUTLINEITEM;
+      return IsInTreeGrid() ? ROLE_SYSTEM_OUTLINEITEM : ROLE_SYSTEM_ROW;
     }
 
     case ui::AX_ROLE_ROW_HEADER:
       return ROLE_SYSTEM_ROWHEADER;
 
     case ui::AX_ROLE_RUBY:
       return ROLE_SYSTEM_TEXT;
 
     case ui::AX_ROLE_RULER:
       return ROLE_SYSTEM_CLIENT;
@@ skipping 79 matching lines @@
 
     case ui::AX_ROLE_LINE_BREAK:
       return ROLE_SYSTEM_WHITESPACE;
 
     case ui::AX_ROLE_VIDEO:
       return ROLE_SYSTEM_GROUPING;
 
     case ui::AX_ROLE_WINDOW:
       return ROLE_SYSTEM_WINDOW;
 
-    // TODO(dmazzoni): figure out the proper MSAA role for roles not called out
-    // here.
-    default:
+    // TODO(dmazzoni): figure out the proper MSAA role for roles listed below.
+    case AX_ROLE_BLOCKQUOTE:
+    case AX_ROLE_BUTTON_DROP_DOWN:
+    case AX_ROLE_CARET:
+    case AX_ROLE_CLIENT:
+    case AX_ROLE_DEFINITION:
+    case AX_ROLE_DESKTOP:
+    case AX_ROLE_DIRECTORY:
+    case AX_ROLE_FIGCAPTION:
+    case AX_ROLE_FOOTER:
+    case AX_ROLE_FORM:
+    case AX_ROLE_IGNORED:
+    case AX_ROLE_IMAGE_MAP:
+    case AX_ROLE_INLINE_TEXT_BOX:
+    case AX_ROLE_LOCATION_BAR:
+    case AX_ROLE_LOG:
+    case AX_ROLE_NONE:
+    case AX_ROLE_PANE:
+    case AX_ROLE_PARAGRAPH:
+    case AX_ROLE_PRESENTATIONAL:
+    case AX_ROLE_SEAMLESS_WEB_AREA:
+    case AX_ROLE_SLIDER_THUMB:
+    case AX_ROLE_SWITCH:
+    case AX_ROLE_TAB_GROUP:
+    case AX_ROLE_TITLE_BAR:
+    case AX_ROLE_UNKNOWN:
+    case AX_ROLE_WEB_VIEW:
       return ROLE_SYSTEM_CLIENT;
   }
+
+  NOTREACHED();
+  return ROLE_SYSTEM_CLIENT;
 }
 
 std::string AXPlatformNodeWin::StringOverrideForMSAARole() {
   std::string html_tag = GetData().GetStringAttribute(ui::AX_ATTR_HTML_TAG);
 
   switch (GetData().role) {
     case ui::AX_ROLE_BLOCKQUOTE:
     case ui::AX_ROLE_DEFINITION:
     case ui::AX_ROLE_IMAGE_MAP:
       return html_tag;
@@ skipping 26 matching lines @@
     case ui::AX_ROLE_SWITCH:
       return "switch";
 
     default:
       return "";
   }
 
   return "";
 }
 
+bool AXPlatformNodeWin::IsWebAreaForPresentationalIframe() {
+  if (GetData().role != ui::AX_ROLE_WEB_AREA &&
+      GetData().role != ui::AX_ROLE_ROOT_WEB_AREA) {
+    return false;
+  }
+
+  auto* parent = FromNativeViewAccessible(GetParent());
+  if (!parent)
+    return false;
+
+  return parent->GetData().role == ui::AX_ROLE_IFRAME_PRESENTATIONAL;
+}
+
 bool AXPlatformNodeWin::ShouldNodeHaveReadonlyState(
     const AXNodeData& data) const {
   if (data.GetBoolAttribute(ui::AX_ATTR_ARIA_READONLY))
     return true;
 
   if (!data.HasState(ui::AX_STATE_READ_ONLY))
     return false;
 
   switch (data.role) {
     case ui::AX_ROLE_ARTICLE:
@@ skipping 307 matching lines @@
     return nullptr;
 
   AXPlatformNodeBase* base =
       FromNativeViewAccessible(node->GetNativeViewAccessible());
   if (base && !IsDescendant(base))
     base = nullptr;
 
   return static_cast<AXPlatformNodeWin*>(base);
 }
 
+bool AXPlatformNodeWin::IsInTreeGrid() {
+  auto* container = FromNativeViewAccessible(GetParent());
+
+  if (container && container->GetData().role == ui::AX_ROLE_GROUP) {
+    // If parent was a rowgroup, we need to look at the grandparent

[dmazzoni, 2017/07/06 22:48:28]

nit: move comment above and get rid of {}

[dougt, 2017/07/11 17:37:44]

Done.

+    container = FromNativeViewAccessible(container->GetParent());
+  }
+
+  if (!container) {

[dmazzoni, 2017/07/06 22:48:28]

nit: remove {}

[dougt, 2017/07/11 17:37:44]

Done.

+    return false;
+  }
+
+  return container->GetData().role == ui::AX_ROLE_TREE_GRID;
+}
+
 }  // namespace ui