AX: ARIA 1.1 implement aria-colcount, aria-colindex, aria-colspan, aria-rowcount...

https://bugs.webkit.org/show_bug.cgi?id=148967

Reviewed by Chris Fleizach.

Source/WebCore:

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:

LayoutTests:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 503e0381c9675fcb96714f22e786826e96711dac..8baa1c781e4a7d7ec3fe7d86b59570c1cbbfcda7 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2015-10-09  Nan Wang  <n_wang@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.fraser@apple.com>
 
         Garbage texture data with composited table row

diff --git a/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt b/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt
index b4cac627458d3356df5a3faae6b0545c8ffdf4a2..ca41b65f401e9e0e68429068de62c4d06ce48f92 100644 (file)
--- a/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt
+++ b/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt
@@ -34,6 +34,8 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 AXColumnIndexRange: NSRange: {0, 1}
 AXColumnHeaderUIElements: <array of size 0>
 AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
 AXElementBusy: 0
 AXRequired: 0
 

diff --git a/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt b/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt
new file mode 100644 (file)
index 0000000..6a22ebe
--- /dev/null
+++ b/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt
@@ -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

diff --git a/LayoutTests/accessibility/mac/aria-table-attributes.html b/LayoutTests/accessibility/mac/aria-table-attributes.html
new file mode 100644 (file)
index 0000000..1870eb0
--- /dev/null
+++ b/LayoutTests/accessibility/mac/aria-table-attributes.html
@@ -0,0 +1,107 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</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="../../resources/js-test-post.js"></script>
+</body>
+</html>

diff --git a/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt b/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt
index f28df68074da6b73569013851ea4a418dec6a622..2fec1c3e90516f685413a31652ef57f9342d62ef 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt
@@ -36,6 +36,8 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 2}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 2}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 AXColumnIndexRange: NSRange: {4, 1}
 AXColumnHeaderUIElements: <array of size 1>
 AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
 AXElementBusy: 0
 AXRequired: 0
 

diff --git a/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt b/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt
index edee34b1c4d179674dd20a6c4dc5859725b94450..f91bd2990e35275ab96df80fedac0726a34ddc3a 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt
@@ -36,6 +36,8 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {2, 2}
 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 @@ AXRowIndexRange: NSRange: {2, 2}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 AXColumnIndexRange: NSRange: {3, 1}
 AXColumnHeaderUIElements: <array of size 0>
 AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
 AXElementBusy: 0
 AXRequired: 0
 

diff --git a/LayoutTests/platform/mac/accessibility/table-cells-expected.txt b/LayoutTests/platform/mac/accessibility/table-cells-expected.txt
index c2e2f52d1c5f826d602ad3959ae1c7b49c4dd865..73bde733743860493b07e9230c6a0b3911092cc5 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-cells-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-cells-expected.txt
@@ -38,6 +38,8 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 2}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {5, 1}
 AXColumnIndexRange: NSRange: {3, 1}
 AXColumnHeaderUIElements: <array of size 1>
 AXRowHeaderUIElements: <array of size 1>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
 AXElementBusy: 0
 AXRequired: 0
 

diff --git a/LayoutTests/platform/mac/accessibility/table-detection-expected.txt b/LayoutTests/platform/mac/accessibility/table-detection-expected.txt
index 839b381790a0598cf192c3d754e36f667cd6de28..b51bd4770aab2985a9c6023fac7a6b65e1e0a369 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-detection-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-detection-expected.txt
@@ -35,6 +35,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -77,6 +79,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -150,6 +154,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -191,6 +197,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -232,6 +240,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -274,6 +284,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -379,6 +391,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -490,6 +504,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -531,6 +547,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -606,6 +624,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 3
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -649,6 +669,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 3
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -692,6 +714,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -734,6 +758,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 1
 AXRowCount: 24
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -798,6 +824,8 @@ AXRowHeaderUIElements: <array of size 1>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 2
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 

diff --git a/LayoutTests/platform/mac/accessibility/table-sections-expected.txt b/LayoutTests/platform/mac/accessibility/table-sections-expected.txt
index d01e7d890d9a1f68fd0c0352198838057c75530d..f3233a351510f177eb4dbf72ed57c08902f7b5dc 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-sections-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-sections-expected.txt
@@ -45,6 +45,8 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {0, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {1, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {2, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 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 @@ AXRowIndexRange: NSRange: {3, 1}
 AXColumnIndexRange: NSRange: {2, 1}
 AXColumnHeaderUIElements: <array of size 0>
 AXRowHeaderUIElements: <array of size 0>
+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
 AXElementBusy: 0
 AXRequired: 0
 

diff --git a/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt b/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt
index 349f52c2b6dac744fc92dea59c051f30cdcfae5c..83f38382427e53cc53beaf8caa72c502c897e227 100644 (file)
--- a/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt
@@ -39,6 +39,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -76,6 +78,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 
@@ -113,6 +117,8 @@ AXRowHeaderUIElements: <array of size 0>
 AXHeader: <AXTable>
 AXColumnCount: 2
 AXRowCount: 1
+AXARIAColumnCount: -1
+AXARIARowCount: -1
 AXElementBusy: 0
 
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ac14a37d72b6fc4a0187afcc501db7ad46c12af7..4c9d07aa4be24f52f569bf06aa63dd0e49b2ae91 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,49 @@
+2015-10-09  Nan Wang  <n_wang@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  <andersca@apple.com>
 
         Remove hack that allowed plug-ins to always take over certain image formats

diff --git a/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp b/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp
index 8923282180b4d2e1c231f48c2bb9b499f165bf24..36aac823d2b5fad9512d4bde311446420d4c1597 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp
+++ b/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp
@@ -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,8 +91,41 @@ void AccessibilityARIAGridCell::rowIndexRange(std::pair<unsigned, unsigned>& row
         }
     }
 
-    // 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
@@ -111,8 +147,20 @@ void AccessibilityARIAGridCell::columnIndexRange(std::pair<unsigned, unsigned>&
         }
     }
     
-    // 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

diff --git a/Source/WebCore/accessibility/AccessibilityARIAGridCell.h b/Source/WebCore/accessibility/AccessibilityARIAGridCell.h
index 17702470b59818f93f37b8f1bbf556b9fb06f666..aa77136be20a192924494e909277638ab4a032ab 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityARIAGridCell.h
+++ b/Source/WebCore/accessibility/AccessibilityARIAGridCell.h
@@ -47,6 +47,8 @@ private:
     explicit AccessibilityARIAGridCell(RenderObject*);
 
     virtual AccessibilityTable* parentTable() const override;
+    AccessibilityObject* parentRowGroup() const;
+    unsigned ariaRowSpanWithRowIndex(unsigned index) const;
 }; 
     
 } // namespace WebCore 

diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
index dbd92eec3a62d98e7863a6af37215a917c21805a..a4fb15f0477744d6c2792093aa8b94a720c2dcff 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -1975,6 +1975,7 @@ static void initializeRoleMap()
         { "radiogroup", RadioGroupRole },
         { "region", DocumentRegionRole },
         { "row", RowRole },
+        { "rowgroup", RowGroupRole },
         { "scrollbar", ScrollBarRole },
         { "search", LandmarkSearchRole },
         { "searchbox", SearchFieldRole },

diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
index 7aa31b0bc92f1aeba4c445365bf3dfbae88195e1..6b191ef34173fc553d22be3e454a6c4876d4010a 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityObject.h
+++ b/Source/WebCore/accessibility/AccessibilityObject.h
@@ -179,6 +179,7 @@ enum AccessibilityRole {
     RadioGroupRole,
     RowHeaderRole,
     RowRole,
+    RowGroupRole,
     RubyBaseRole,
     RubyBlockRole,
     RubyInlineRole,

diff --git a/Source/WebCore/accessibility/AccessibilityTable.cpp b/Source/WebCore/accessibility/AccessibilityTable.cpp
index bfe2094fac0c12fa0b9733e02bf845a4034e7cae..5f21da6dbb86fc4293ef243b9b28b7b954646e1a 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTable.cpp
+++ b/Source/WebCore/accessibility/AccessibilityTable.cpp
@@ -675,4 +675,30 @@ String AccessibilityTable::title() const
     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

diff --git a/Source/WebCore/accessibility/AccessibilityTable.h b/Source/WebCore/accessibility/AccessibilityTable.h
index acddca5a883843ffb740afed1acbbb49553b131a..255729dc5c363eaf3f4f39d84063fedd4a7676e0 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTable.h
+++ b/Source/WebCore/accessibility/AccessibilityTable.h
@@ -74,6 +74,9 @@ public:
 
     // 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*);

diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.cpp b/Source/WebCore/accessibility/AccessibilityTableCell.cpp
index 94fc0854a54abddbf4d3aa6a7938b999f5a49946..70dd0f9b5ffd5433f74c24fdd4a0cad53b96e9bd 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTableCell.cpp
+++ b/Source/WebCore/accessibility/AccessibilityTableCell.cpp
@@ -44,6 +44,7 @@ using namespace HTMLNames;
 
 AccessibilityTableCell::AccessibilityTableCell(RenderObject* renderer)
     : AccessibilityRenderObject(renderer)
+    , m_ariaColIndexFromRow(-1)
 {
 }
 
@@ -370,4 +371,58 @@ AccessibilityObject* AccessibilityTableCell::titleUIElement() const
     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

diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.h b/Source/WebCore/accessibility/AccessibilityTableCell.h
index 09f80e9e3bfc226d0ca94fa531bec232e4111398..85c41825279210ab48064161bda176776f61a714 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTableCell.h
+++ b/Source/WebCore/accessibility/AccessibilityTableCell.h
@@ -53,6 +53,12 @@ public:
     
     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 @@ protected:
     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.

diff --git a/Source/WebCore/accessibility/AccessibilityTableRow.cpp b/Source/WebCore/accessibility/AccessibilityTableRow.cpp
index 9ccce1f75347d878a822f71accba636e708c32be..b51b18c418286ca185ab17b721bce5b8e4b798b0 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTableRow.cpp
+++ b/Source/WebCore/accessibility/AccessibilityTableRow.cpp
@@ -137,4 +137,42 @@ AccessibilityObject* AccessibilityTableRow::headerObject()
     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

diff --git a/Source/WebCore/accessibility/AccessibilityTableRow.h b/Source/WebCore/accessibility/AccessibilityTableRow.h
index aa1fd58c6755a1474dde9a27595a1aa7c9ea21a3..887c213c786430a9fb8649636a00d43ea9dd20a6 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilityTableRow.h
+++ b/Source/WebCore/accessibility/AccessibilityTableRow.h
@@ -51,6 +51,11 @@ public:
     // 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*);
 

diff --git a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
index 16f6f6e207f8e48c94b45a5591105db2d992813a..f9efe3d4df9aedf1d5a7f9cf1415a3347a87604d 100644 (file)
--- a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
+++ b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
@@ -800,6 +800,7 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO
         case VideoRole:
         case WebAreaRole:
         case WindowRole:
+        case RowGroupRole:
             return false;
     }
     

diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
index bb8bed053f4744409d082d7462d432350fe4dfce..c16d45f9c8b65495a0d66fb72e436562be535ac8 100644 (file)
--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -252,6 +252,23 @@ using namespace HTMLNames;
 #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 @@ static id textMarkerRangeFromVisiblePositions(AXObjectCache *cache, const Visibl
         [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 @@ static id textMarkerRangeFromVisiblePositions(AXObjectCache *cache, const Visibl
         [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 @@ static NSString* roleValueToNSString(AccessibilityRole value)
         
         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 @@ static NSString* roleValueToNSString(AccessibilityRole value)
             cell.rowHeaders(rowHeaders);
             return convertToNSArray(rowHeaders);
         }
+        if ([attributeName isEqualToString:NSAccessibilityARIAColumnIndexAttribute])
+            return @(cell.ariaColumnIndex());
+        
+        if ([attributeName isEqualToString:NSAccessibilityARIARowIndexAttribute])
+            return @(cell.ariaRowIndex());
     }
     
     if (m_object->isTree()) {

diff --git a/Source/WebCore/html/HTMLAttributeNames.in b/Source/WebCore/html/HTMLAttributeNames.in
index 4f159486139ace20fbc0a99ee0436720e56fc86f..b9a7d47e8f4864c56820233e1fa8a2a3ce636d95 100644 (file)
--- a/Source/WebCore/html/HTMLAttributeNames.in
+++ b/Source/WebCore/html/HTMLAttributeNames.in
@@ -17,6 +17,9 @@ aria-activedescendant
 aria-atomic
 aria-busy
 aria-checked
+aria-colcount
+aria-colindex
+aria-colspan
 aria-controls
 aria-current
 aria-describedby
@@ -45,6 +48,9 @@ aria-readonly
 aria-relevant
 aria-required
 aria-roledescription
+aria-rowcount
+aria-rowindex
+aria-rowspan
 aria-selected
 aria-setsize
 aria-sort