Implemented ARIA colindex, rowindex, colcount and rowcount for Chromevox.

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 684 matching lines @@
         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);
+        dst->AddIntAttribute(ui::AX_ATTR_ARIA_COLUMN_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) {
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_INDEX, src.rowIndex());
       WebAXObject header = src.rowHeader();
       if (!header.isDetached())
@@ skipping 15 matching lines @@
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX,
                              src.cellColumnIndex());
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_COLUMN_SPAN,
                              src.cellColumnSpan());
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX,
                              src.cellRowIndex());
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_SPAN,src.cellRowSpan());
 
         int aria_colindex = src.ariaColumnIndex();
         if (aria_colindex)
-          dst->AddIntAttribute(ui::AX_ATTR_ARIA_COL_INDEX, aria_colindex);
+          dst->AddIntAttribute(ui::AX_ATTR_ARIA_CELL_COLUMN_INDEX,

[dmazzoni, 2017/04/11 02:57:38]

nit: this needs braces now

+                               aria_colindex);
       }
 
       int aria_rowindex = src.ariaRowIndex();
       if (aria_rowindex)
-        dst->AddIntAttribute(ui::AX_ATTR_ARIA_ROW_INDEX, aria_rowindex);
+        dst->AddIntAttribute(ui::AX_ATTR_ARIA_CELL_ROW_INDEX, aria_rowindex);
     }
 
     if ((dst->role == ui::AX_ROLE_ROW_HEADER ||
          dst->role == ui::AX_ROLE_COLUMN_HEADER) && src.sortDirection()) {
       dst->AddIntAttribute(ui::AX_ATTR_SORT_DIRECTION,
                            AXSortDirectionFromBlink(src.sortDirection()));
     }
   }
 
   // The majority of the rest of this code computes attributes needed for
@@ skipping 126 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->document();
   if (!document.isNull())
     return document.accessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content