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 688 matching lines @@
             }
           }
           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);
       }
 
       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);
+        if (aria_colindex) {
+          dst->AddIntAttribute(ui::AX_ATTR_ARIA_CELL_COLUMN_INDEX,
+                               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()));
     }
   }
 
@@ skipping 125 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->GetDocument();
   if (!document.IsNull())
     return document.AccessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content