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

third_party/WebKit/Source/modules/accessibility/AXTableCell.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 12 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/accessibility/AXTableCell.h"
 
 #include "core/layout/LayoutTableCell.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
+#include "modules/accessibility/AXTableRow.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 AXTableCell::AXTableCell(LayoutObject* layoutObject,
                          AXObjectCacheImpl& axObjectCache)
     : AXLayoutObject(layoutObject, axObjectCache) {}
 
 AXTableCell::~AXTableCell() {}
@@ skipping 51 matching lines @@
 }
 
 bool AXTableCell::isTableCell() const {
   AXObject* parent = parentObjectUnignored();
   if (!parent || !parent->isTableRow())
     return false;
 
   return true;
 }
 
+unsigned AXTableCell::ariaColumnIndex() const
+{
+  const AtomicString& colIndex = getAttribute(aria_colindexAttr);
+  if (colIndex.toInt() >= 1)
+    return colIndex.toInt();
+
+  AXObject* parent = parentObjectUnignored();
+  if (!parent || !parent->isTableRow())

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

Is this check necessary? How would m_ariaColIndexFromRow get set if this were
not the case?

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

This can happen in teardown, or if the AX tree is rearranged,
for example. All of the other methods here do the same check.

+    return 0;
+
+  return m_ariaColIndexFromRow;
+}
+
+unsigned AXTableCell::ariaRowIndex() const
+{
+  const AtomicString& rowIndex = getAttribute(aria_rowindexAttr);
+  if (rowIndex.toInt() >= 1)
+    return rowIndex.toInt();
+
+  AXObject* parent = parentObjectUnignored();
+  if (!parent || !parent->isTableRow())
+    return 0;
+
+  return toAXTableRow(parent)->ariaRowIndex();
+}
+
 static AccessibilityRole decideRoleFromSibling(LayoutTableCell* siblingCell) {
   if (!siblingCell)
     return CellRole;
 
   if (Node* siblingNode = siblingCell->node()) {
     if (siblingNode->hasTagName(thTag))
       return ColumnHeaderRole;
     if (siblingNode->hasTagName(tdTag))
       return RowHeaderRole;
   }
@@ skipping 89 matching lines @@
   if (equalIgnoringCase(ariaSort, "ascending"))
     return SortDirectionAscending;
   if (equalIgnoringCase(ariaSort, "descending"))
     return SortDirectionDescending;
   if (equalIgnoringCase(ariaSort, "other"))
     return SortDirectionOther;
   return SortDirectionUndefined;
 }
 
 }  // namespace blink