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

content/browser/accessibility/browser_accessibility.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.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 763 matching lines @@
     return true;
 
   if (base::EqualsASCII(value, "mixed"))
     *is_mixed = true;
 
   return false;  // Not set.
 }
 
 BrowserAccessibility* BrowserAccessibility::GetTable() const {
   BrowserAccessibility* table = const_cast<BrowserAccessibility*>(this);
-  while (table && !table->IsTableOrGridOrTreeGridRole())
+  while (table && !table->IsTableLikeRole())
     table = table->PlatformGetParent();
   return table;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetTableCell(int index) const {
-  if (!IsTableOrGridOrTreeGridRole() && !IsCellOrTableHeaderRole())
+  if (!IsTableLikeRole() && !IsCellOrTableHeaderRole())
     return nullptr;
 
   BrowserAccessibility* table = GetTable();
   if (!table)
     return nullptr;
   const std::vector<int32_t>& unique_cell_ids =
       table->GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS);
   if (index < 0 || index >= static_cast<int>(unique_cell_ids.size()))
     return nullptr;
   return table->manager_->GetFromID(unique_cell_ids[index]);
 }
 
 BrowserAccessibility* BrowserAccessibility::GetTableCell(int row,
                                                          int column) const {
-  if (!IsTableOrGridOrTreeGridRole() && !IsCellOrTableHeaderRole())
+  if (!IsTableLikeRole() && !IsCellOrTableHeaderRole())
     return nullptr;
   if (row < 0 || row >= GetTableRowCount() || column < 0 ||
       column >= GetTableColumnCount()) {
     return nullptr;
   }
 
   BrowserAccessibility* table = GetTable();
   if (!table)
     return nullptr;
 
@@ skipping 78 matching lines @@
 bool BrowserAccessibility::HasState(ui::AXState state_enum) const {
   return (GetState() >> state_enum) & 1;
 }
 
 bool BrowserAccessibility::IsCellOrTableHeaderRole() const {
   return (GetRole() == ui::AX_ROLE_CELL ||
           GetRole() == ui::AX_ROLE_COLUMN_HEADER ||
           GetRole() == ui::AX_ROLE_ROW_HEADER);
 }
 
-bool BrowserAccessibility::IsTableOrGridOrTreeGridRole() const {
+bool BrowserAccessibility::IsTableLikeRole() const {
   return (GetRole() == ui::AX_ROLE_TABLE ||
           GetRole() == ui::AX_ROLE_GRID ||
           GetRole() == ui::AX_ROLE_TREE_GRID);
 }
 
 bool BrowserAccessibility::HasCaret() const {
   if (IsSimpleTextControl() && HasIntAttribute(ui::AX_ATTR_TEXT_SEL_START) &&
       HasIntAttribute(ui::AX_ATTR_TEXT_SEL_END)) {
     return true;
   }
@@ skipping 274 matching lines @@
   return gfx::kNullAcceleratedWidget;
 }
 
 bool BrowserAccessibility::AccessibilityPerformAction(
     const ui::AXActionData& data) {
   NOTREACHED();
   return false;
 }
 
 }  // namespace content