Expose internal treegrid role, do some cleanup for table/grid/treegrid handling

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2012 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/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 3784 matching lines @@
         break;
       case ui::AX_ARIA_CURRENT_STATE_TIME:
         win_attributes_->ia2_attributes.push_back(L"current:time");
         break;
     }
   }
 
   // Expose table cell index.
   if (IsCellOrTableHeaderRole()) {
     BrowserAccessibility* table = PlatformGetParent();
-    while (table && table->GetRole() != ui::AX_ROLE_TABLE)
+    while (table && !table->IsTableLikeRole())
       table = table->PlatformGetParent();
     if (table) {
       const std::vector<int32_t>& unique_cell_ids =
           table->GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS);
       for (size_t i = 0; i < unique_cell_ids.size(); ++i) {
         if (unique_cell_ids[i] == GetId()) {
           win_attributes_->ia2_attributes.push_back(
               base::string16(L"table-cell-index:") + base::IntToString16(i));
         }
       }
     }
   }
 
   // Expose aria-colcount and aria-rowcount in a table, grid or treegrid.
-  if (IsTableOrGridOrTreeGridRole()) {
+  if (IsTableLikeRole()) {
     IntAttributeToIA2(ui::AX_ATTR_ARIA_COL_COUNT, "colcount");
     IntAttributeToIA2(ui::AX_ATTR_ARIA_ROW_COUNT, "rowcount");
   }
 
   // Expose aria-colindex and aria-rowindex in a cell or row.
   if (IsCellOrTableHeaderRole() || GetRole() == ui::AX_ROLE_ROW) {
     if (GetRole() != ui::AX_ROLE_ROW)
       IntAttributeToIA2(ui::AX_ATTR_ARIA_COL_INDEX, "colindex");
     IntAttributeToIA2(ui::AX_ATTR_ARIA_ROW_INDEX, "rowindex");
   }
@@ skipping 1468 matching lines @@
     case ui::AX_ROLE_FORM:
       role_name = L"form";
       ia2_role = IA2_ROLE_FORM;
       break;
     case ui::AX_ROLE_FOOTER:
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_FOOTER;
       break;
     case ui::AX_ROLE_GRID:
       ia_role = ROLE_SYSTEM_TABLE;
-      ia_state |= STATE_SYSTEM_READONLY;
+      // 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
+      // ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_GROUP: {
       base::string16 aria_role = GetString16Attribute(
           ui::AX_ATTR_ROLE);
       if (aria_role == L"group" || html_tag == L"fieldset") {
         ia_role = ROLE_SYSTEM_GROUPING;
       } else if (html_tag == L"li") {
         ia_role = ROLE_SYSTEM_LISTITEM;
         ia_state |= STATE_SYSTEM_READONLY;
       } else {
@@ skipping 210 matching lines @@
     case ui::AX_ROLE_SVG_ROOT:
       ia_role = ROLE_SYSTEM_GRAPHIC;
       break;
     case ui::AX_ROLE_SWITCH:
       role_name = L"switch";
       ia2_role = IA2_ROLE_TOGGLE_BUTTON;
       break;
     case ui::AX_ROLE_TAB:
       ia_role = ROLE_SYSTEM_PAGETAB;
       break;
-    case ui::AX_ROLE_TABLE: {
-      base::string16 aria_role = GetString16Attribute(
-          ui::AX_ATTR_ROLE);
-      if (aria_role == L"treegrid") {
-        ia_role = ROLE_SYSTEM_OUTLINE;
-      } else {
-        ia_role = ROLE_SYSTEM_TABLE;
-      }
+    case ui::AX_ROLE_TABLE:
+      ia_role = ROLE_SYSTEM_TABLE;
       break;
-    }
     case ui::AX_ROLE_TABLE_HEADER_CONTAINER:
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_SECTION;
       ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_TAB_LIST:
       ia_role = ROLE_SYSTEM_PAGETABLIST;
       break;
     case ui::AX_ROLE_TAB_PANEL:
       ia_role = ROLE_SYSTEM_PROPERTYPAGE;
@@ skipping 101 matching lines @@
   BrowserAccessibility* container = item->PlatformGetParent();
   if (container && container->GetRole() == ui::AX_ROLE_GROUP) {
     // If parent was a rowgroup, we need to look at the grandparent
     container = container->PlatformGetParent();
   }
 
   if (!container) {
     return false;
   }
 
-  const ui::AXRole role = container->GetRole();
-  return role == ui::AX_ROLE_TREE_GRID ||
-         (role == ui::AX_ROLE_TABLE &&
-          container->GetString16Attribute(ui::AX_ATTR_ROLE) == L"treegrid");
+  return container->GetRole() == ui::AX_ROLE_TREE_GRID;
 }
 
 BrowserAccessibilityWin* ToBrowserAccessibilityWin(BrowserAccessibility* obj) {
   DCHECK(!obj || obj->IsNative());
   return static_cast<BrowserAccessibilityWin*>(obj);
 }
 
 const BrowserAccessibilityWin*
 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) {
   DCHECK(!obj || obj->IsNative());
   return static_cast<const BrowserAccessibilityWin*>(obj);
 }
 
 }  // namespace content