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

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 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_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 156 matching lines @@
   if (IsIframe() || (GetRole() == ui::AX_ROLE_ROOT_WEB_AREA))
     return false;
   return IsFocusable();
 }
 
 bool BrowserAccessibilityAndroid::IsCollapsed() const {
   return HasState(ui::AX_STATE_COLLAPSED);
 }
 
 bool BrowserAccessibilityAndroid::IsCollection() const {
-  return (GetRole() == ui::AX_ROLE_GRID ||
-          GetRole() == ui::AX_ROLE_LIST ||
+  return (IsTableOrGridOrTreeGridRole() || GetRole() == ui::AX_ROLE_LIST ||

[dmazzoni, 2017/04/18 21:59:38]

Maybe IsTableLikeRole?

[aleventhal, 2017/04/19 20:24:02]

Done.

           GetRole() == ui::AX_ROLE_LIST_BOX ||
           GetRole() == ui::AX_ROLE_DESCRIPTION_LIST ||
-          GetRole() == ui::AX_ROLE_TABLE ||
           GetRole() == ui::AX_ROLE_TREE);
 }
 
 bool BrowserAccessibilityAndroid::IsCollectionItem() const {
   return (GetRole() == ui::AX_ROLE_CELL ||
           GetRole() == ui::AX_ROLE_COLUMN_HEADER ||
           GetRole() == ui::AX_ROLE_DESCRIPTION_LIST_TERM ||
           GetRole() == ui::AX_ROLE_LIST_BOX_OPTION ||
           GetRole() == ui::AX_ROLE_LIST_ITEM ||
           GetRole() == ui::AX_ROLE_ROW_HEADER ||
@@ skipping 176 matching lines @@
       class_name = ui::kAXImageClassname;
       break;
     case ui::AX_ROLE_METER:
     case ui::AX_ROLE_PROGRESS_INDICATOR:
       class_name = ui::kAXProgressBarClassname;
       break;
     case ui::AX_ROLE_TAB_LIST:
       class_name = ui::kAXTabWidgetClassname;
       break;
     case ui::AX_ROLE_GRID:
+    case ui::AX_ROLE_TREE_GRID:
     case ui::AX_ROLE_TABLE:
       class_name = ui::kAXGridViewClassname;
       break;
     case ui::AX_ROLE_LIST:
     case ui::AX_ROLE_LIST_BOX:
     case ui::AX_ROLE_DESCRIPTION_LIST:
       class_name = ui::kAXListViewClassname;
       break;
     case ui::AX_ROLE_DIALOG:
       class_name = ui::kAXDialogClassname;
@@ skipping 851 matching lines @@
   else if (live == "assertive")
     return ANDROID_VIEW_VIEW_ACCESSIBILITY_LIVE_REGION_ASSERTIVE;
   return ANDROID_VIEW_VIEW_ACCESSIBILITY_LIVE_REGION_NONE;
 }
 
 int BrowserAccessibilityAndroid::AndroidRangeType() const {
   return ANDROID_VIEW_ACCESSIBILITY_RANGE_TYPE_FLOAT;
 }
 
 int BrowserAccessibilityAndroid::RowCount() const {
-  if (GetRole() == ui::AX_ROLE_GRID ||
-      GetRole() == ui::AX_ROLE_TABLE) {
+  if (IsTableOrGridOrTreeGridRole()) {
     return CountChildrenWithRole(ui::AX_ROLE_ROW);
   }
 
   if (GetRole() == ui::AX_ROLE_LIST ||
       GetRole() == ui::AX_ROLE_LIST_BOX ||
       GetRole() == ui::AX_ROLE_DESCRIPTION_LIST ||
       GetRole() == ui::AX_ROLE_TREE) {
     return PlatformChildCount();
   }
 
   return 0;
 }
 
 int BrowserAccessibilityAndroid::ColumnCount() const {
-  if (GetRole() == ui::AX_ROLE_GRID ||
-      GetRole() == ui::AX_ROLE_TABLE) {
+  if (IsTableOrGridOrTreeGridRole()) {
     return CountChildrenWithRole(ui::AX_ROLE_COLUMN);
   }
   return 0;
 }
 
 int BrowserAccessibilityAndroid::RowIndex() const {
   if (GetRole() == ui::AX_ROLE_LIST_ITEM ||
       GetRole() == ui::AX_ROLE_LIST_BOX_OPTION ||
       GetRole() == ui::AX_ROLE_TREE_ITEM) {
     return GetIndexInParent();
@@ skipping 230 matching lines @@
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
   for (uint32_t i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content