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

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 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/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 651 matching lines @@
     }
 
     if (dst->role == ui::AX_ROLE_DIALOG ||
         dst->role == ui::AX_ROLE_ALERT_DIALOG) {
       dst->AddBoolAttribute(ui::AX_ATTR_MODAL, src.IsModal());
     }
 
     if (dst->role == ui::AX_ROLE_ROOT_WEB_AREA)
       dst->AddStringAttribute(ui::AX_ATTR_HTML_TAG, "#document");
 
-    if (dst->role == ui::AX_ROLE_TABLE) {
+    const bool is_table_like_role = dst->role == ui::AX_ROLE_TABLE ||
+                                    dst->role == ui::AX_ROLE_GRID ||
+                                    dst->role == ui::AX_ROLE_TREE_GRID;
+    if (is_table_like_role) {
       int column_count = src.ColumnCount();
       int row_count = src.RowCount();
       if (column_count > 0 && row_count > 0) {
         std::set<int32_t> unique_cell_id_set;
         std::vector<int32_t> cell_ids;
         std::vector<int32_t> unique_cell_ids;
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_COUNT, column_count);
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, row_count);
         WebAXObject header = src.HeaderContainerObject();
         if (!header.IsDetached())
           dst->AddIntAttribute(ui::AX_ATTR_TABLE_HEADER_ID, header.AxID());
         for (int i = 0; i < column_count * row_count; ++i) {
           WebAXObject cell =
               src.CellForColumnAndRow(i % column_count, i / column_count);
           int cell_id = -1;
           if (!cell.IsDetached()) {
             cell_id = cell.AxID();
             if (unique_cell_id_set.find(cell_id) == unique_cell_id_set.end()) {
               unique_cell_id_set.insert(cell_id);
               unique_cell_ids.push_back(cell_id);
             }
           }
           cell_ids.push_back(cell_id);
         }
         dst->AddIntListAttribute(ui::AX_ATTR_CELL_IDS, cell_ids);
         dst->AddIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS, unique_cell_ids);
       }
-    }
 
-    if (dst->role == ui::AX_ROLE_TABLE ||
-        dst->role == ui::AX_ROLE_GRID ||
-        dst->role == ui::AX_ROLE_TREE_GRID) {
       int aria_colcount = src.AriaColumnCount();
       if (aria_colcount)
         dst->AddIntAttribute(ui::AX_ATTR_ARIA_COL_COUNT, aria_colcount);
 
       int aria_rowcount = src.AriaRowCount();
       if (aria_rowcount)
         dst->AddIntAttribute(ui::AX_ATTR_ARIA_ROW_COUNT, aria_rowcount);
     }
 
     if (dst->role == ui::AX_ROLE_ROW) {
@@ skipping 170 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->GetDocument();
   if (!document.IsNull())
     return document.AccessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content