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);
 }
 
-AccessibilityRole AXTableRow::determineAccessibilityRole() {
+void AXTableRow::addChildren()
+{
+  AXLayoutObject::addChildren();
+  int colIndex = ariaColumnIndex();

[aboxhall, 2016/11/29 17:36:54]

An explanation of what is going on here would be helpful. I had to squint at the
spec for a bit to figure out why it makes sense to put a colindex value on a
row.

[dmazzoni, 2016/11/30 22:48:17]

I added a comment to clarify. It's so you don't need to set the column index on
every cell in the whole table if they're contiguous but just
not starting at 1.

+  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();
+      return AXLayoutObject::determineAccessibilityRole();

[aboxhall, 2016/11/29 17:36:54]

Formatting weirdness?

[dmazzoni, 2016/11/30 22:48:17]

Done.

 
   if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
     return m_ariaRole;
 
   return RowRole;
 }
 
 bool AXTableRow::isTableRow() const {
   AXObject* table = parentTable();
   if (!table || !table->isAXTable())
@@ skipping 26 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