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

third_party/WebKit/Source/modules/accessibility/AXTable.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 473 matching lines @@
 
   updateChildrenIfNecessary();
   unsigned rowCount = m_rows.size();
   for (unsigned r = 0; r < rowCount; r++) {
     AXObject* row = m_rows[r].get();
     if (row->isTableRow())
       toAXTableRow(m_rows[r].get())->headerObjectsForRow(headers);
   }
 }
 
-unsigned AXTable::columnCount() {
+int AXTable::ariaColumnCount()
+{
+  const AtomicString& colCountValue = getAttribute(aria_colcountAttr);
+  int colCountInt = colCountValue.toInt();
+
+  if (colCountInt > (int)columnCount())
+    return colCountInt;
+
+  // Spec says that if all of the columns are present in the DOM, it
+  // is not necessary to set this attribute as the user agent can
+  // automatically calculate the total number of columns.
+  // It returns 0 in order not to set this attribute.
+  if (colCountInt == (int)columnCount() || colCountInt != -1)
+    return 0;
+
+  return -1;
+}
+
+int AXTable::ariaRowCount()
+{
+  const AtomicString& rowCountValue = getAttribute(aria_rowcountAttr);

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

Any point checking hasAttribute here and early outing with return 0? (And
similarly in colcount)

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

Done.

+  int rowCountInt = rowCountValue.toInt();
+
+  if (rowCountInt > (int)rowCount())
+    return rowCountInt;
+
+  // Spec says that If all of the rows are present in the DOM, it is
+  // not necessary to set this attribute as the user agent can
+  // automatically calculate the total number of rows. .
+  // It returns 0 in order not to set this attribute.
+  if (rowCountInt == (int)rowCount() || rowCountInt != -1)
+    return 0;
+
+  return -1;
+}
+
+unsigned AXTable::columnCount()
+{
   updateChildrenIfNecessary();
 
   return m_columns.size();
 }
 
 unsigned AXTable::rowCount() {
   updateChildrenIfNecessary();
 
   return m_rows.size();
 }
@@ skipping 58 matching lines @@
 }
 
 DEFINE_TRACE(AXTable) {
   visitor->trace(m_rows);
   visitor->trace(m_columns);
   visitor->trace(m_headerContainer);
   AXLayoutObject::trace(visitor);
 }
 
 }  // namespace blink