Diff
Modified: trunk/LayoutTests/ChangeLog (190832 => 190833)
--- trunk/LayoutTests/ChangeLog 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/ChangeLog 2015-10-10 01:08:32 UTC (rev 190833)
@@ -1,3 +1,20 @@
+2015-10-09 Nan Wang <n_w...@apple.com>
+
+ AX: ARIA 1.1 implement aria-colcount, aria-colindex, aria-colspan, aria-rowcount, aria-rowindex and aria-rowspan
+ https://bugs.webkit.org/show_bug.cgi?id=148967
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/mac/aria-columnrowheaders-expected.txt:
+ * accessibility/mac/aria-table-attributes-expected.txt: Added.
+ * accessibility/mac/aria-table-attributes.html: Added.
+ * platform/mac/accessibility/table-attributes-expected.txt:
+ * platform/mac/accessibility/table-cell-spans-expected.txt:
+ * platform/mac/accessibility/table-cells-expected.txt:
+ * platform/mac/accessibility/table-detection-expected.txt:
+ * platform/mac/accessibility/table-sections-expected.txt:
+ * platform/mac/accessibility/table-with-rules-expected.txt:
+
2015-10-09 Simon Fraser <simon.fra...@apple.com>
Garbage texture data with composited table row
Modified: trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt (190832 => 190833)
--- trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -34,6 +34,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -66,6 +68,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -98,6 +102,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -131,6 +137,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -163,6 +171,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
Added: trunk/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt (0 => 190833)
--- trunk/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -0,0 +1,29 @@
+This tests that attributes related to aria table/grid are working correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS grid.numberAttributeValue('AXARIAColumnCount') is 16
+PASS grid.numberAttributeValue('AXARIARowCount') is 30
+PASS cell1.numberAttributeValue('AXARIAColumnIndex') is 2
+PASS cell1.numberAttributeValue('AXARIARowIndex') is 7
+PASS cell2.numberAttributeValue('AXARIAColumnIndex') is 4
+PASS cell2.numberAttributeValue('AXARIARowIndex') is 8
+PASS cell4.numberAttributeValue('AXARIAColumnIndex') is 3
+PASS cell2.rowIndexRange() is '{1, 2}'
+PASS cell5.columnIndexRange() is '{2, 3}'
+PASS cell3.rowIndexRange() is '{1, 2}'
+PASS cell6.rowIndexRange() is '{0, 2}'
+PASS cell7.rowIndexRange() is '{0, 2}'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+First Name Last Name Company Address
+Fred Jackson Acme, Inc. 123 Broad St.
+Sara James
+Footer 1 Footer 2 Footer 3
+Name Company Address
+Cell Span Cell
+Cell
+January $100
+February
Added: trunk/LayoutTests/accessibility/mac/aria-table-attributes.html (0 => 190833)
--- trunk/LayoutTests/accessibility/mac/aria-table-attributes.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/aria-table-attributes.html 2015-10-10 01:08:32 UTC (rev 190833)
@@ -0,0 +1,107 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+
+<div id="grid" role="grid" aria-colcount="16" aria-rowcount="30">
+ <div role="rowgroup">
+ <div role="row" aria-rowindex="7">
+ <span id="cell1" role="columnheader" aria-colindex="2">First Name</span>
+ <span role="columnheader" aria-colindex="3">Last Name</span>
+ <span role="columnheader" aria-colindex="4">Company</span>
+ <span role="columnheader" aria-colindex="5">Address</span>
+ </div>
+ </div>
+ <div role="rowgroup">
+ <div role="row" aria-rowindex="8">
+ <span role="gridcell" aria-colindex="2" aria-rowindex="8">Fred</span>
+ <span role="gridcell" aria-colindex="3" aria-rowindex="8">Jackson</span>
+ <span id="cell2" role="gridcell" aria-colindex="4" aria-rowindex="8" aria-rowspan="2">Acme, Inc.</span>
+ <span id="cell3" role="gridcell" aria-colindex="5" aria-rowindex="8" aria-rowspan="0">123 Broad St.</span>
+ </div>
+ <div role="row" aria-rowindex="9">
+ <span role="gridcell" aria-colindex="2">Sara</span>
+ <span role="gridcell" aria-colindex="3">James</span>
+ </div>
+ </div>
+ <div role="rowgroup">
+ <div role="row" aria-rowindex="15">
+ <span role="gridcell" aria-colindex="2">Footer 1</span>
+ <span role="gridcell" aria-colindex="3">Footer 2</span>
+ <span role="gridcell" aria-colindex="4" aria-colspan="2">Footer 3</span>
+ </div>
+ </div>
+</div>
+
+<div id="grid2" role="grid" aria-colcount="16">
+ <div role="rowgroup">
+ <div role="row" aria-colindex="2">
+ <span role="columnheader">Name</span>
+ <span id="cell4" role="columnheader">Company</span>
+ <span id="cell5" role="columnheader" aria-colspan="3">Address</span>
+ </div>
+ </div>
+</div>
+
+<div id="grid3" role="grid">
+ <div role="row">
+ <span role="gridcell">Cell</span>
+ <span id="cell6" role="gridcell" aria-rowspan="0">Span Cell</span>
+ </div>
+ <div role="row">
+ <span role="gridcell">Cell</span>
+ </div>
+</div>
+
+<table role="grid">
+ <tr>
+ <td>January</td>
+ <td id="cell7" rowspan="2" aria-rowspan="3">$100</td>
+ </tr>
+ <tr><td>February</td></tr>
+</table>
+
+<script>
+
+ description("This tests that attributes related to aria table/grid are working correctly.");
+
+ if (window.accessibilityController) {
+
+ var grid = accessibilityController.accessibleElementById("grid");
+ var cell1 = accessibilityController.accessibleElementById("cell1");
+ var cell2 = accessibilityController.accessibleElementById("cell2");
+ var cell3 = accessibilityController.accessibleElementById("cell3");
+ var cell4 = accessibilityController.accessibleElementById("cell4");
+ var cell5 = accessibilityController.accessibleElementById("cell5");
+ var cell6 = accessibilityController.accessibleElementById("cell6");
+ var cell7 = accessibilityController.accessibleElementById("cell7");
+
+ // aria-colcount and aria-rowcount
+ shouldBe("grid.numberAttributeValue('AXARIAColumnCount')", "16");
+ shouldBe("grid.numberAttributeValue('AXARIARowCount')", "30");
+
+ // aria-colindex and aria-rowindex
+ shouldBe("cell1.numberAttributeValue('AXARIAColumnIndex')", "2");
+ shouldBe("cell1.numberAttributeValue('AXARIARowIndex')", "7");
+ shouldBe("cell2.numberAttributeValue('AXARIAColumnIndex')", "4");
+ shouldBe("cell2.numberAttributeValue('AXARIARowIndex')", "8");
+ // aria-colindex from parent row
+ shouldBe("cell4.numberAttributeValue('AXARIAColumnIndex')", "3");
+
+ // aria-colspan and aria-rowspan
+ shouldBe("cell2.rowIndexRange()", "'{1, 2}'");
+ shouldBe("cell5.columnIndexRange()", "'{2, 3}'");
+ // aria-rowspan="0"
+ shouldBe("cell3.rowIndexRange()", "'{1, 2}'");
+ shouldBe("cell6.rowIndexRange()", "'{0, 2}'");
+ // use rowspan for native table
+ shouldBe("cell7.rowIndexRange()", "'{0, 2}'");
+ }
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -36,6 +36,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -68,6 +70,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -100,6 +104,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -132,6 +138,8 @@
AXColumnIndexRange: NSRange: {3, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -164,6 +172,8 @@
AXColumnIndexRange: NSRange: {3, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -200,6 +210,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -232,6 +244,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -264,6 +278,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -296,6 +312,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -607,6 +625,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -639,6 +659,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -671,6 +693,8 @@
AXColumnIndexRange: NSRange: {3, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -703,6 +727,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -735,6 +761,8 @@
AXColumnIndexRange: NSRange: {4, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -767,6 +795,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -799,6 +829,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -831,6 +863,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -863,6 +897,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -895,6 +931,8 @@
AXColumnIndexRange: NSRange: {4, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -927,6 +965,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -959,6 +999,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -991,6 +1033,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1023,6 +1067,8 @@
AXColumnIndexRange: NSRange: {4, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
Modified: trunk/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -36,6 +36,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -71,6 +73,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -106,6 +110,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -141,6 +147,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -176,6 +184,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
Modified: trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -38,6 +38,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -71,6 +73,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -104,6 +108,8 @@
AXColumnIndexRange: NSRange: {0, 2}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -137,6 +143,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -170,6 +178,8 @@
AXColumnIndexRange: NSRange: {3, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
Modified: trunk/LayoutTests/platform/mac/accessibility/table-detection-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-detection-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-detection-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -35,6 +35,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -77,6 +79,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -150,6 +154,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -191,6 +197,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -232,6 +240,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -274,6 +284,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -379,6 +391,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -490,6 +504,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -531,6 +547,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -606,6 +624,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 3
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -649,6 +669,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 3
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -692,6 +714,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -734,6 +758,8 @@
AXHeader: <AXTable>
AXColumnCount: 1
AXRowCount: 24
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -798,6 +824,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
Modified: trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -45,6 +45,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -77,6 +79,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -109,6 +113,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -145,6 +151,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -177,6 +185,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -209,6 +219,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -458,6 +470,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -490,6 +504,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -522,6 +538,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -554,6 +572,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -586,6 +606,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -618,6 +640,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -650,6 +674,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -682,6 +708,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -714,6 +742,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -746,6 +776,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -778,6 +810,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -810,6 +844,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -881,6 +917,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -913,6 +951,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -945,6 +985,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -981,6 +1023,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1013,6 +1057,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1045,6 +1091,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1294,6 +1342,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1326,6 +1376,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1358,6 +1410,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1390,6 +1444,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1422,6 +1478,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1454,6 +1512,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1486,6 +1546,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1518,6 +1580,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1550,6 +1614,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1582,6 +1648,8 @@
AXColumnIndexRange: NSRange: {0, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1614,6 +1682,8 @@
AXColumnIndexRange: NSRange: {1, 1}
AXColumnHeaderUIElements: <array of size 1>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
@@ -1646,6 +1716,8 @@
AXColumnIndexRange: NSRange: {2, 1}
AXColumnHeaderUIElements: <array of size 0>
AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
AXElementBusy: 0
AXRequired: 0
Modified: trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt (190832 => 190833)
--- trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt 2015-10-10 01:08:32 UTC (rev 190833)
@@ -39,6 +39,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -76,6 +78,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
@@ -113,6 +117,8 @@
AXHeader: <AXTable>
AXColumnCount: 2
AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
AXElementBusy: 0
Modified: trunk/Source/WebCore/ChangeLog (190832 => 190833)
--- trunk/Source/WebCore/ChangeLog 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/ChangeLog 2015-10-10 01:08:32 UTC (rev 190833)
@@ -1,3 +1,49 @@
+2015-10-09 Nan Wang <n_w...@apple.com>
+
+ AX: ARIA 1.1 implement aria-colcount, aria-colindex, aria-colspan, aria-rowcount, aria-rowindex and aria-rowspan
+ https://bugs.webkit.org/show_bug.cgi?id=148967
+
+ Reviewed by Chris Fleizach.
+
+ Added support for ARIA 1.1 table/grid related attributes. Created new attributes for mac, so
+ VoiceOver can pick up the information and speak accordingly.
+
+ Test: accessibility/mac/aria-table-attributes.html
+
+ * accessibility/AccessibilityARIAGridCell.cpp:
+ (WebCore::AccessibilityARIAGridCell::AccessibilityARIAGridCell):
+ (WebCore::AccessibilityARIAGridCell::rowIndexRange):
+ (WebCore::AccessibilityARIAGridCell::columnIndexRange):
+ (WebCore::AccessibilityARIAGridCell::parentRowGroup):
+ * accessibility/AccessibilityARIAGridCell.h:
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::initializeRoleMap):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::title):
+ (WebCore::AccessibilityTable::ariaColumnCount):
+ (WebCore::AccessibilityTable::ariaRowCount):
+ * accessibility/AccessibilityTable.h:
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::AccessibilityTableCell):
+ (WebCore::AccessibilityTableCell::titleUIElement):
+ (WebCore::AccessibilityTableCell::ariaColumnIndex):
+ (WebCore::AccessibilityTableCell::ariaRowIndex):
+ (WebCore::AccessibilityTableCell::ariaColumnSpan):
+ (WebCore::AccessibilityTableCell::ariaRowSpan):
+ * accessibility/AccessibilityTableCell.h:
+ (WebCore::AccessibilityTableCell::setARIAColIndexFromRow):
+ * accessibility/AccessibilityTableRow.cpp:
+ (WebCore::AccessibilityTableRow::headerObject):
+ (WebCore::AccessibilityTableRow::addChildren):
+ (WebCore::AccessibilityTableRow::ariaColumnIndex):
+ (WebCore::AccessibilityTableRow::ariaRowIndex):
+ * accessibility/AccessibilityTableRow.h:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ * html/HTMLAttributeNames.in:
+
2015-10-09 Anders Carlsson <ander...@apple.com>
Remove hack that allowed plug-ins to always take over certain image formats
Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2015-10-10 01:08:32 UTC (rev 190833)
@@ -32,9 +32,12 @@
#include "AccessibilityObject.h"
#include "AccessibilityTable.h"
#include "AccessibilityTableRow.h"
+#include "HTMLNames.h"
namespace WebCore {
+using namespace HTMLNames;
+
AccessibilityARIAGridCell::AccessibilityARIAGridCell(RenderObject* renderer)
: AccessibilityTableCell(renderer)
{
@@ -88,10 +91,43 @@
}
}
- // as far as I can tell, grid cells cannot span rows
- rowRange.second = 1;
+ // ARIA 1.1, aria-rowspan attribute is intended for cells and gridcells which are not contained in a native table.
+ // So we should check for that attribute here.
+ rowRange.second = ariaRowSpanWithRowIndex(rowRange.first);
}
+unsigned AccessibilityARIAGridCell::ariaRowSpanWithRowIndex(unsigned rowIndex) const
+{
+ unsigned rowSpan = AccessibilityTableCell::ariaRowSpan();
+ AccessibilityObject* parent = parentObjectUnignored();
+ if (!parent)
+ return 1;
+
+ // Setting the value to 0 indicates that the cell or gridcell is to span all the remaining rows in the row group.
+ if (!rowSpan) {
+ // rowSpan defaults to 1.
+ rowSpan = 1;
+ if (AccessibilityObject* parentRowGroup = this->parentRowGroup()) {
+ // If the row group is the parent table, we use total row count to calculate the span.
+ if (is<AccessibilityTable>(*parentRowGroup))
+ rowSpan = downcast<AccessibilityTable>(*parentRowGroup).rowCount() - rowIndex;
+ // Otherwise, we have to get the index for the current row within the parent row group.
+ else if (is<AccessibilityTableRow>(*parent)) {
+ const auto& siblings = parentRowGroup->children();
+ unsigned rowCount = siblings.size();
+ for (unsigned k = 0; k < rowCount; ++k) {
+ if (siblings[k].get() == parent) {
+ rowSpan = rowCount - k;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return rowSpan;
+}
+
void AccessibilityARIAGridCell::columnIndexRange(std::pair<unsigned, unsigned>& columnRange) const
{
AccessibilityObject* parent = parentObjectUnignored();
@@ -111,8 +147,20 @@
}
}
- // as far as I can tell, grid cells cannot span columns
- columnRange.second = 1;
+ // ARIA 1.1, aria-colspan attribute is intended for cells and gridcells which are not contained in a native table.
+ // So we should check for that attribute here.
+ columnRange.second = ariaColumnSpan();
}
+
+AccessibilityObject* AccessibilityARIAGridCell::parentRowGroup() const
+{
+ for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
+ if (parent->hasTagName(theadTag) || parent->hasTagName(tbodyTag) || parent->hasTagName(tfootTag) || parent->roleValue() == RowGroupRole)
+ return parent;
+ }
+
+ // If there's no row group found, we use the parent table as the row group.
+ return parentTable();
+}
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2015-10-10 01:08:32 UTC (rev 190833)
@@ -47,6 +47,8 @@
explicit AccessibilityARIAGridCell(RenderObject*);
virtual AccessibilityTable* parentTable() const override;
+ AccessibilityObject* parentRowGroup() const;
+ unsigned ariaRowSpanWithRowIndex(unsigned index) const;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-10-10 01:08:32 UTC (rev 190833)
@@ -1975,6 +1975,7 @@
{ "radiogroup", RadioGroupRole },
{ "region", DocumentRegionRole },
{ "row", RowRole },
+ { "rowgroup", RowGroupRole },
{ "scrollbar", ScrollBarRole },
{ "search", LandmarkSearchRole },
{ "searchbox", SearchFieldRole },
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-10-10 01:08:32 UTC (rev 190833)
@@ -179,6 +179,7 @@
RadioGroupRole,
RowHeaderRole,
RowRole,
+ RowGroupRole,
RubyBaseRole,
RubyBlockRole,
RubyInlineRole,
Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2015-10-10 01:08:32 UTC (rev 190833)
@@ -675,4 +675,30 @@
return title;
}
+int AccessibilityTable::ariaColumnCount() const
+{
+ const AtomicString& colCountValue = getAttribute(aria_colcountAttr);
+
+ int colCountInt = colCountValue.toInt();
+ // If only a portion of the columns is present in the DOM at a given moment, this attribute is needed to
+ // provide an explicit indication of the number of columns in the full table.
+ if (colCountInt > (int)m_columns.size())
+ return colCountInt;
+
+ return -1;
+}
+
+int AccessibilityTable::ariaRowCount() const
+{
+ const AtomicString& rowCountValue = getAttribute(aria_rowcountAttr);
+
+ int rowCountInt = rowCountValue.toInt();
+ // If only a portion of the rows is present in the DOM at a given moment, this attribute is needed to
+ // provide an explicit indication of the number of rows in the full table.
+ if (rowCountInt > (int)m_rows.size())
+ return rowCountInt;
+
+ return -1;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.h (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTable.h 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.h 2015-10-10 01:08:32 UTC (rev 190833)
@@ -74,6 +74,9 @@
// isExposableThroughAccessibility() is whether it is exposed as an AccessibilityTable to the platform.
bool isExposableThroughAccessibility() const;
+
+ int ariaColumnCount() const;
+ int ariaRowCount() const;
protected:
explicit AccessibilityTable(RenderObject*);
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2015-10-10 01:08:32 UTC (rev 190833)
@@ -44,6 +44,7 @@
AccessibilityTableCell::AccessibilityTableCell(RenderObject* renderer)
: AccessibilityRenderObject(renderer)
+ , m_ariaColIndexFromRow(-1)
{
}
@@ -370,4 +371,58 @@
return axObjectCache()->getOrCreate(headerCell);
}
+int AccessibilityTableCell::ariaColumnIndex() const
+{
+ const AtomicString& colIndexValue = getAttribute(aria_colindexAttr);
+ if (colIndexValue.toInt() >= 1)
+ return colIndexValue.toInt();
+
+ // "ARIA 1.1: If the set of columns which is present in the DOM is contiguous, and if there are no cells which span more than one row
+ // or column in that set, then authors may place aria-colindex on each row, setting the value to the index of the first column of the set."
+ // Here, we let its parent row to set its index beforehand, so we don't have to go through the siblings to calculate the index.
+ AccessibilityTableRow* parentRow = this->parentRow();
+ if (parentRow && m_ariaColIndexFromRow != -1)
+ return m_ariaColIndexFromRow;
+
+ return -1;
+}
+
+int AccessibilityTableCell::ariaRowIndex() const
+{
+ // ARIA 1.1: Authors should place aria-rowindex on each row. Authors may also place
+ // aria-rowindex on all of the children or owned elements of each row.
+ const AtomicString& rowIndexValue = getAttribute(aria_rowindexAttr);
+ if (rowIndexValue.toInt() >= 1)
+ return rowIndexValue.toInt();
+
+ if (AccessibilityTableRow* parentRow = this->parentRow())
+ return parentRow->ariaRowIndex();
+
+ return -1;
+}
+
+unsigned AccessibilityTableCell::ariaColumnSpan() const
+{
+ const AtomicString& colSpanValue = getAttribute(aria_colspanAttr);
+ // ARIA 1.1: Authors must set the value of aria-colspan to an integer greater than or equal to 1.
+ if (colSpanValue.toInt() >= 1)
+ return colSpanValue.toInt();
+
+ return 1;
+}
+
+unsigned AccessibilityTableCell::ariaRowSpan() const
+{
+ const AtomicString& rowSpanValue = getAttribute(aria_rowspanAttr);
+
+ // ARIA 1.1: Authors must set the value of aria-rowspan to an integer greater than or equal to 0.
+ // Setting the value to 0 indicates that the cell or gridcell is to span all the remaining rows in the row group.
+ if (equalIgnoringCase(rowSpanValue, "0"))
+ return 0;
+ if (rowSpanValue.toInt() >= 1)
+ return rowSpanValue.toInt();
+
+ return 1;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2015-10-10 01:08:32 UTC (rev 190833)
@@ -53,6 +53,12 @@
void columnHeaders(AccessibilityChildrenVector&);
void rowHeaders(AccessibilityChildrenVector&);
+
+ int ariaColumnIndex() const;
+ int ariaRowIndex() const;
+ unsigned ariaColumnSpan() const;
+ unsigned ariaRowSpan() const;
+ void setARIAColIndexFromRow(int index) { m_ariaColIndexFromRow = index; }
protected:
explicit AccessibilityTableCell(RenderObject*);
@@ -62,6 +68,7 @@
virtual AccessibilityRole determineAccessibilityRole() override final;
int m_rowIndex;
+ int m_ariaColIndexFromRow;
private:
// If a table cell is not exposed as a table cell, a TH element can serve as its title UI element.
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2015-10-10 01:08:32 UTC (rev 190833)
@@ -137,4 +137,42 @@
return cell;
}
+void AccessibilityTableRow::addChildren()
+{
+ AccessibilityRenderObject::addChildren();
+
+ // "ARIA 1.1, If the set of columns which is present in the DOM is contiguous, and if there are no cells which span more than one row or
+ // column in that set, then authors may place aria-colindex on each row, setting the value to the index of the first column of the set."
+ // Update child cells' ariaColIndex if there's an aria-colindex value set for the row. So the cell doesn't have to go through the siblings
+ // to calculate the index.
+ int colIndex = ariaColumnIndex();
+ if (colIndex == -1)
+ return;
+
+ unsigned index = 0;
+ for (const auto& cell : children()) {
+ if (is<AccessibilityTableCell>(*cell))
+ downcast<AccessibilityTableCell>(*cell).setARIAColIndexFromRow(colIndex + index);
+ index++;
+ }
+}
+
+int AccessibilityTableRow::ariaColumnIndex() const
+{
+ const AtomicString& colIndexValue = getAttribute(aria_colindexAttr);
+ if (colIndexValue.toInt() >= 1)
+ return colIndexValue.toInt();
+
+ return -1;
+}
+
+int AccessibilityTableRow::ariaRowIndex() const
+{
+ const AtomicString& rowIndexValue = getAttribute(aria_rowindexAttr);
+ if (rowIndexValue.toInt() >= 1)
+ return rowIndexValue.toInt();
+
+ return -1;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.h (190832 => 190833)
--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2015-10-10 01:08:32 UTC (rev 190833)
@@ -51,6 +51,11 @@
// in the row, but their col/row spans overlap into it
void appendChild(AccessibilityObject*);
+ virtual void addChildren() override;
+
+ int ariaColumnIndex() const;
+ int ariaRowIndex() const;
+
protected:
explicit AccessibilityTableRow(RenderObject*);
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (190832 => 190833)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-10-10 01:08:32 UTC (rev 190833)
@@ -800,6 +800,7 @@
case VideoRole:
case WebAreaRole:
case WindowRole:
+ case RowGroupRole:
return false;
}
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (190832 => 190833)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-10-10 01:08:32 UTC (rev 190833)
@@ -252,6 +252,23 @@
#define NSAccessibilityARIACurrentAttribute @"AXARIACurrent"
#endif
+// Table/grid attributes
+#ifndef NSAccessibilityARIAColumnIndexAttribute
+#define NSAccessibilityARIAColumnIndexAttribute @"AXARIAColumnIndex"
+#endif
+
+#ifndef NSAccessibilityARIARowIndexAttribute
+#define NSAccessibilityARIARowIndexAttribute @"AXARIARowIndex"
+#endif
+
+#ifndef NSAccessibilityARIAColumnCountAttribute
+#define NSAccessibilityARIAColumnCountAttribute @"AXARIAColumnCount"
+#endif
+
+#ifndef NSAccessibilityARIARowCountAttribute
+#define NSAccessibilityARIARowCountAttribute @"AXARIARowCount"
+#endif
+
// Search
#ifndef NSAccessibilityImmediateDescendantsOnly
#define NSAccessibilityImmediateDescendantsOnly @"AXImmediateDescendantsOnly"
@@ -1551,6 +1568,8 @@
[tempArray addObject:NSAccessibilityHeaderAttribute];
[tempArray addObject:NSAccessibilityColumnCountAttribute];
[tempArray addObject:NSAccessibilityRowCountAttribute];
+ [tempArray addObject:NSAccessibilityARIAColumnCountAttribute];
+ [tempArray addObject:NSAccessibilityARIARowCountAttribute];
tableAttrs = [[NSArray alloc] initWithArray:tempArray];
[tempArray release];
}
@@ -1575,6 +1594,8 @@
[tempArray addObject:NSAccessibilityColumnIndexRangeAttribute];
[tempArray addObject:NSAccessibilityColumnHeaderUIElementsAttribute];
[tempArray addObject:NSAccessibilityRowHeaderUIElementsAttribute];
+ [tempArray addObject:NSAccessibilityARIAColumnIndexAttribute];
+ [tempArray addObject:NSAccessibilityARIARowIndexAttribute];
tableCellAttrs = [[NSArray alloc] initWithArray:tempArray];
[tempArray release];
}
@@ -2730,6 +2751,12 @@
if ([attributeName isEqualToString:NSAccessibilityRowCountAttribute])
return @(table.rowCount());
+
+ if ([attributeName isEqualToString:NSAccessibilityARIAColumnCountAttribute])
+ return @(table.ariaColumnCount());
+
+ if ([attributeName isEqualToString:NSAccessibilityARIARowCountAttribute])
+ return @(table.ariaRowCount());
}
if (is<AccessibilityTableColumn>(*m_object)) {
@@ -2772,6 +2799,11 @@
cell.rowHeaders(rowHeaders);
return convertToNSArray(rowHeaders);
}
+ if ([attributeName isEqualToString:NSAccessibilityARIAColumnIndexAttribute])
+ return @(cell.ariaColumnIndex());
+
+ if ([attributeName isEqualToString:NSAccessibilityARIARowIndexAttribute])
+ return @(cell.ariaRowIndex());
}
if (m_object->isTree()) {
Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (190832 => 190833)
--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2015-10-10 01:08:32 UTC (rev 190833)
@@ -17,6 +17,9 @@
aria-atomic
aria-busy
aria-checked
+aria-colcount
+aria-colindex
+aria-colspan
aria-controls
aria-current
aria-describedby
@@ -45,6 +48,9 @@
aria-relevant
aria-required
aria-roledescription
+aria-rowcount
+aria-rowindex
+aria-rowspan
aria-selected
aria-setsize
aria-sort
