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

third_party/WebKit/Source/modules/accessibility/AXTableRow.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 29 matching lines @@
                        AXObjectCacheImpl& axObjectCache)
     : AXLayoutObject(layoutObject, axObjectCache) {}
 
 AXTableRow::~AXTableRow() {}
 
 AXTableRow* AXTableRow::create(LayoutObject* layoutObject,
                                AXObjectCacheImpl& axObjectCache) {
   return new AXTableRow(layoutObject, axObjectCache);
 }
 
+void AXTableRow::addChildren() {
+  AXLayoutObject::addChildren();
+
+  // A row is allowed to have a column index that's then applied to all

[aboxhall, 2016/12/02 17:39:26]

nit: this explanation may give the impression that all columns will share the
same column index value. Perhaps reword as something like "A row may have an
aria-colindex value indicating the index of the first visible column in a
contiguous block."

[dmazzoni, 2016/12/14 17:41:03]

Done.

+  // cells within that row, if they're all contiguous.
+  int colIndex = ariaColumnIndex();
+  if (!colIndex)
+    return;
+
+  unsigned index = 0;
+  for (const auto& cell : children()) {
+    if (cell->isTableCell())
+      toAXTableCell(cell.get())->setARIAColIndexFromRow(colIndex + index);
+    index++;
+  }
+}
+
 AccessibilityRole AXTableRow::determineAccessibilityRole() {
   if (!isTableRow())
     return AXLayoutObject::determineAccessibilityRole();
 
   if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
     return m_ariaRole;
 
   return RowRole;
 }
 
@@ skipping 29 matching lines @@
 
 AXObject* AXTableRow::headerObject() {
   AXObjectVector headers;
   headerObjectsForRow(headers);
   if (!headers.size())
     return 0;
 
   return headers[0].get();
 }
 
+unsigned AXTableRow::ariaColumnIndex() const {
+  const AtomicString& colIndexValue = getAttribute(aria_colindexAttr);
+  if (colIndexValue.toInt() >= 1)
+    return colIndexValue.toInt();
+
+  return 0;
+}
+
+unsigned AXTableRow::ariaRowIndex() const {
+  const AtomicString& rowIndexValue = getAttribute(aria_rowindexAttr);
+  if (rowIndexValue.toInt() >= 1)
+    return rowIndexValue.toInt();
+
+  return 0;
+}
+
 void AXTableRow::headerObjectsForRow(AXObjectVector& headers) {
   if (!m_layoutObject || !m_layoutObject->isTableRow())
     return;
 
   for (const auto& cell : children()) {
     if (!cell->isTableCell())
       continue;
 
     if (toAXTableCell(cell.get())->scanToDecideHeaderRole() == RowHeaderRole)
       headers.append(cell);
   }
 }
 
 }  // namespace blink