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

ui/accessibility/ax_node_data.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 "ui/accessibility/ax_node_data.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 92 matching lines @@
     case AX_ATTR_SET_SIZE:
     case AX_ATTR_POS_IN_SET:
     case AX_ATTR_COLOR_VALUE:
     case AX_ATTR_ARIA_CURRENT_STATE:
     case AX_ATTR_BACKGROUND_COLOR:
     case AX_ATTR_COLOR:
     case AX_ATTR_INVALID_STATE:
     case AX_ATTR_CHECKED_STATE:
     case AX_ATTR_TEXT_DIRECTION:
     case AX_ATTR_TEXT_STYLE:
-    case AX_ATTR_ARIA_COL_COUNT:
-    case AX_ATTR_ARIA_COL_INDEX:
+    case AX_ATTR_ARIA_COLUMN_COUNT:
+    case AX_ATTR_ARIA_CELL_COLUMN_INDEX:
     case AX_ATTR_ARIA_ROW_COUNT:
-    case AX_ATTR_ARIA_ROW_INDEX:
+    case AX_ATTR_ARIA_CELL_ROW_INDEX:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 // Return true if |attr| contains a vector of node ids that would need
 // to be mapped when renumbering the ids in a combined tree.
 bool IsNodeIdIntListAttribute(AXIntListAttribute attr) {
@@ skipping 390 matching lines @@
         break;
       case AX_ATTR_HIERARCHICAL_LEVEL:
         result += " level=" + value;
         break;
       case AX_ATTR_TEXT_SEL_START:
         result += " sel_start=" + value;
         break;
       case AX_ATTR_TEXT_SEL_END:
         result += " sel_end=" + value;
         break;
-      case AX_ATTR_ARIA_COL_COUNT:
-        result += " aria_col_count=" + value;
+      case AX_ATTR_ARIA_COLUMN_COUNT:
+        result += " aria_column_count=" + value;
         break;
-      case AX_ATTR_ARIA_COL_INDEX:
-        result += " aria_col_index=" + value;
+      case AX_ATTR_ARIA_CELL_COLUMN_INDEX:
+        result += " aria_cell_column_index=" + value;
         break;
       case AX_ATTR_ARIA_ROW_COUNT:
         result += " aria_row_count=" + value;
         break;
-      case AX_ATTR_ARIA_ROW_INDEX:
-        result += " aria_row_index=" + value;
+      case AX_ATTR_ARIA_CELL_ROW_INDEX:
+        result += " aria_cell_row_index=" + value;
         break;
       case AX_ATTR_TABLE_ROW_COUNT:
         result += " rows=" + value;
         break;
       case AX_ATTR_TABLE_COLUMN_COUNT:
         result += " cols=" + value;
         break;
       case AX_ATTR_TABLE_CELL_COLUMN_INDEX:
         result += " col=" + value;
         break;
@@ skipping 393 matching lines @@
     }
   }
 
   if (!child_ids.empty())
     result += " child_ids=" + IntVectorToString(child_ids);
 
   return result;
 }
 
 }  // namespace ui