ARIA 1.1: implementation for aria-col-* and aria-row-*.

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 82 matching lines @@
     case ui::AX_ROLE_MAIN:
       return "main";
     case ui::AX_ROLE_NAVIGATION:
       return "navigation";
     case ui::AX_ROLE_RADIO_BUTTON:
       return "radio";
     case ui::AX_ROLE_REGION:
       return "region";
     case ui::AX_ROLE_SLIDER:
       return "slider";
+    case ui::AX_ROLE_TIME:
+      return "time";
     default:
       break;
   }
 
   return std::string();
 }
 
 void AddIntListAttributeFromWebObjects(ui::AXIntListAttribute attr,
                                        WebVector<WebAXObject> objects,
                                        AXContentNodeData* dst) {
@@ skipping 489 matching lines @@
               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) {
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_INDEX, src.rowIndex());
       WebAXObject header = src.rowHeader();
       if (!header.isDetached())
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_HEADER_ID, header.axID());
     }
 
     if (dst->role == ui::AX_ROLE_COLUMN) {
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_INDEX, src.columnIndex());
       WebAXObject header = src.columnHeader();
       if (!header.isDetached())
         dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_HEADER_ID, header.axID());
     }
 
     if (dst->role == ui::AX_ROLE_CELL ||
         dst->role == ui::AX_ROLE_ROW_HEADER ||
-        dst->role == ui::AX_ROLE_COLUMN_HEADER) {
-      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());
+        dst->role == ui::AX_ROLE_COLUMN_HEADER ||
+        dst->role == ui::AX_ROLE_ROW) {
+      if (dst->role != ui::AX_ROLE_ROW) {
+        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);
+      }
+
+      int aria_rowindex = src.ariaRowIndex();
+      if (aria_rowindex)
+        dst->AddIntAttribute(ui::AX_ATTR_ARIA_ROW_INDEX, aria_rowindex);
     }
 
     if ((dst->role == ui::AX_ROLE_ROW_HEADER ||
-        dst->role == ui::AX_ROLE_COLUMN_HEADER) && src.sortDirection()) {
+         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
   // all modes, not just for screen readers.
 
   WebNode node = src.node();
   bool is_iframe = false;
@@ skipping 37 matching lines @@
 
     // ARIA role.
     if (element.hasAttribute("role")) {
       dst->AddStringAttribute(
           ui::AX_ATTR_ROLE,
           element.getAttribute("role").utf8());
     } else {
       std::string role = GetEquivalentAriaRoleString(dst->role);
       if (!role.empty())
         dst->AddStringAttribute(ui::AX_ATTR_ROLE, role);
-      else if (dst->role == ui::AX_ROLE_TIME)
-        dst->AddStringAttribute(ui::AX_ATTR_ROLE, "time");
     }
 
     // Browser plugin (used in a <webview>).
     BrowserPlugin* browser_plugin = BrowserPlugin::GetFromNode(element);
     if (browser_plugin) {
       dst->AddContentIntAttribute(
           AX_CONTENT_ATTR_CHILD_BROWSER_PLUGIN_INSTANCE_ID,
           browser_plugin->browser_plugin_instance_id());
     }
 
@@ skipping 64 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->document();
   if (!document.isNull())
     return document.accessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content