<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190833] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190833">190833</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2015-10-09 18:08:32 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacariacolumnrowheadersexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytableattributesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablecellspansexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablecellsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytabledetectionexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-detection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablesectionsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytablewithrulesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp">trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellh">trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTablecpp">trunk/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableh">trunk/Source/WebCore/accessibility/AccessibilityTable.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp">trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellh">trunk/Source/WebCore/accessibility/AccessibilityTableCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableRowcpp">trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableRowh">trunk/Source/WebCore/accessibility/AccessibilityTableRow.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttributeNamesin">trunk/Source/WebCore/html/HTMLAttributeNames.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacariatableattributesexpectedtxt">trunk/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacariatableattributeshtml">trunk/LayoutTests/accessibility/mac/aria-table-attributes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-09 23:30:32 UTC (rev 190832)
+++ trunk/LayoutTests/ChangeLog 2015-10-10 01:08:32 UTC (rev 190833)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-10-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Garbage texture data with composited table row
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariacolumnrowheadersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/aria-columnrowheaders-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -66,6 +68,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -98,6 +102,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -131,6 +137,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -163,6 +171,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariatableattributesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-table-attributes-expected.txt (0 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+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
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacariatableattributeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/aria-table-attributes.html (0 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+<!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>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytableattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-attributes-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -68,6 +70,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -100,6 +104,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -132,6 +138,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -164,6 +172,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -200,6 +210,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -232,6 +244,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -264,6 +278,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -296,6 +312,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -607,6 +625,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -639,6 +659,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -671,6 +693,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -703,6 +727,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -735,6 +761,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {4, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -767,6 +795,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -799,6 +829,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -831,6 +863,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -863,6 +897,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -895,6 +931,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {4, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -927,6 +965,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -959,6 +999,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -991,6 +1033,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1023,6 +1067,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {4, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablecellspansexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -71,6 +73,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -106,6 +110,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -141,6 +147,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -176,6 +184,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablecellsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-cells-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -71,6 +73,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -104,6 +108,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 2}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -137,6 +143,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -170,6 +178,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {3, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytabledetectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-detection-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 2
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -77,6 +79,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -150,6 +154,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -191,6 +197,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -232,6 +240,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 2
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -274,6 +284,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -379,6 +391,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -490,6 +504,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -531,6 +547,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 2
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -606,6 +624,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 3
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -649,6 +669,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 3
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -692,6 +714,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 2
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -734,6 +758,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 1
</span><span class="cx"> AXRowCount: 24
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -798,6 +824,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 2
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablesectionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-sections-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -77,6 +79,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -109,6 +113,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -145,6 +151,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -177,6 +185,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -209,6 +219,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -458,6 +470,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -490,6 +504,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -522,6 +538,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -554,6 +572,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -586,6 +606,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -618,6 +640,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -650,6 +674,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -682,6 +708,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -714,6 +742,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -746,6 +776,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -778,6 +810,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -810,6 +844,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -881,6 +917,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -913,6 +951,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -945,6 +985,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -981,6 +1023,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1013,6 +1057,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1045,6 +1091,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1294,6 +1342,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1326,6 +1376,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1358,6 +1410,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1390,6 +1444,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1422,6 +1478,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1454,6 +1512,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1486,6 +1546,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1518,6 +1580,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1550,6 +1614,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 1>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1582,6 +1648,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {0, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1614,6 +1682,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {1, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 1>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span><span class="lines">@@ -1646,6 +1716,8 @@
</span><span class="cx"> AXColumnIndexRange: NSRange: {2, 1}
</span><span class="cx"> AXColumnHeaderUIElements: <array of size 0>
</span><span class="cx"> AXRowHeaderUIElements: <array of size 0>
</span><ins>+AXARIAColumnIndex: -1
+AXARIARowIndex: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytablewithrulesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -76,6 +78,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -113,6 +117,8 @@
</span><span class="cx"> AXHeader: <AXTable>
</span><span class="cx"> AXColumnCount: 2
</span><span class="cx"> AXRowCount: 1
</span><ins>+AXARIAColumnCount: -1
+AXARIARowCount: -1
</ins><span class="cx"> AXElementBusy: 0
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-10-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove hack that allowed plug-ins to always take over certain image formats
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,9 +32,12 @@
</span><span class="cx"> #include "AccessibilityObject.h"
</span><span class="cx"> #include "AccessibilityTable.h"
</span><span class="cx"> #include "AccessibilityTableRow.h"
</span><ins>+#include "HTMLNames.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+using namespace HTMLNames;
+
</ins><span class="cx"> AccessibilityARIAGridCell::AccessibilityARIAGridCell(RenderObject* renderer)
</span><span class="cx"> : AccessibilityTableCell(renderer)
</span><span class="cx"> {
</span><span class="lines">@@ -88,10 +91,43 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // as far as I can tell, grid cells cannot span rows
- rowRange.second = 1;
</del><ins>+ // 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void AccessibilityARIAGridCell::columnIndexRange(std::pair<unsigned, unsigned>& columnRange) const
</span><span class="cx"> {
</span><span class="cx"> AccessibilityObject* parent = parentObjectUnignored();
</span><span class="lines">@@ -111,8 +147,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // as far as I can tell, grid cells cannot span columns
- columnRange.second = 1;
</del><ins>+ // 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();
</ins><span class="cx"> }
</span><ins>+
+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();
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> explicit AccessibilityARIAGridCell(RenderObject*);
</span><span class="cx">
</span><span class="cx"> virtual AccessibilityTable* parentTable() const override;
</span><ins>+ AccessibilityObject* parentRowGroup() const;
+ unsigned ariaRowSpanWithRowIndex(unsigned index) const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1975,6 +1975,7 @@
</span><span class="cx"> { "radiogroup", RadioGroupRole },
</span><span class="cx"> { "region", DocumentRegionRole },
</span><span class="cx"> { "row", RowRole },
</span><ins>+ { "rowgroup", RowGroupRole },
</ins><span class="cx"> { "scrollbar", ScrollBarRole },
</span><span class="cx"> { "search", LandmarkSearchRole },
</span><span class="cx"> { "searchbox", SearchFieldRole },
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> RadioGroupRole,
</span><span class="cx"> RowHeaderRole,
</span><span class="cx"> RowRole,
</span><ins>+ RowGroupRole,
</ins><span class="cx"> RubyBaseRole,
</span><span class="cx"> RubyBlockRole,
</span><span class="cx"> RubyInlineRole,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -675,4 +675,30 @@
</span><span class="cx"> return title;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.h (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -74,6 +74,9 @@
</span><span class="cx">
</span><span class="cx"> // isExposableThroughAccessibility() is whether it is exposed as an AccessibilityTable to the platform.
</span><span class="cx"> bool isExposableThroughAccessibility() const;
</span><ins>+
+ int ariaColumnCount() const;
+ int ariaRowCount() const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit AccessibilityTable(RenderObject*);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell::AccessibilityTableCell(RenderObject* renderer)
</span><span class="cx"> : AccessibilityRenderObject(renderer)
</span><ins>+ , m_ariaColIndexFromRow(-1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -370,4 +371,58 @@
</span><span class="cx"> return axObjectCache()->getOrCreate(headerCell);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,6 +53,12 @@
</span><span class="cx">
</span><span class="cx"> void columnHeaders(AccessibilityChildrenVector&);
</span><span class="cx"> void rowHeaders(AccessibilityChildrenVector&);
</span><ins>+
+ int ariaColumnIndex() const;
+ int ariaRowIndex() const;
+ unsigned ariaColumnSpan() const;
+ unsigned ariaRowSpan() const;
+ void setARIAColIndexFromRow(int index) { m_ariaColIndexFromRow = index; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit AccessibilityTableCell(RenderObject*);
</span><span class="lines">@@ -62,6 +68,7 @@
</span><span class="cx"> virtual AccessibilityRole determineAccessibilityRole() override final;
</span><span class="cx">
</span><span class="cx"> int m_rowIndex;
</span><ins>+ int m_ariaColIndexFromRow;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // If a table cell is not exposed as a table cell, a TH element can serve as its title UI element.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -137,4 +137,42 @@
</span><span class="cx"> return cell;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.h (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx"> // in the row, but their col/row spans overlap into it
</span><span class="cx"> void appendChild(AccessibilityObject*);
</span><span class="cx">
</span><ins>+ virtual void addChildren() override;
+
+ int ariaColumnIndex() const;
+ int ariaRowIndex() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit AccessibilityTableRow(RenderObject*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -800,6 +800,7 @@
</span><span class="cx"> case VideoRole:
</span><span class="cx"> case WebAreaRole:
</span><span class="cx"> case WindowRole:
</span><ins>+ case RowGroupRole:
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -252,6 +252,23 @@
</span><span class="cx"> #define NSAccessibilityARIACurrentAttribute @"AXARIACurrent"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// 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
+
</ins><span class="cx"> // Search
</span><span class="cx"> #ifndef NSAccessibilityImmediateDescendantsOnly
</span><span class="cx"> #define NSAccessibilityImmediateDescendantsOnly @"AXImmediateDescendantsOnly"
</span><span class="lines">@@ -1551,6 +1568,8 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilityHeaderAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityColumnCountAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityRowCountAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityARIAColumnCountAttribute];
+ [tempArray addObject:NSAccessibilityARIARowCountAttribute];
</ins><span class="cx"> tableAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -1575,6 +1594,8 @@
</span><span class="cx"> [tempArray addObject:NSAccessibilityColumnIndexRangeAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityColumnHeaderUIElementsAttribute];
</span><span class="cx"> [tempArray addObject:NSAccessibilityRowHeaderUIElementsAttribute];
</span><ins>+ [tempArray addObject:NSAccessibilityARIAColumnIndexAttribute];
+ [tempArray addObject:NSAccessibilityARIARowIndexAttribute];
</ins><span class="cx"> tableCellAttrs = [[NSArray alloc] initWithArray:tempArray];
</span><span class="cx"> [tempArray release];
</span><span class="cx"> }
</span><span class="lines">@@ -2730,6 +2751,12 @@
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowCountAttribute])
</span><span class="cx"> return @(table.rowCount());
</span><ins>+
+ if ([attributeName isEqualToString:NSAccessibilityARIAColumnCountAttribute])
+ return @(table.ariaColumnCount());
+
+ if ([attributeName isEqualToString:NSAccessibilityARIARowCountAttribute])
+ return @(table.ariaRowCount());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<AccessibilityTableColumn>(*m_object)) {
</span><span class="lines">@@ -2772,6 +2799,11 @@
</span><span class="cx"> cell.rowHeaders(rowHeaders);
</span><span class="cx"> return convertToNSArray(rowHeaders);
</span><span class="cx"> }
</span><ins>+ if ([attributeName isEqualToString:NSAccessibilityARIAColumnIndexAttribute])
+ return @(cell.ariaColumnIndex());
+
+ if ([attributeName isEqualToString:NSAccessibilityARIARowIndexAttribute])
+ return @(cell.ariaRowIndex());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_object->isTree()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (190832 => 190833)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -17,6 +17,9 @@
</span><span class="cx"> aria-atomic
</span><span class="cx"> aria-busy
</span><span class="cx"> aria-checked
</span><ins>+aria-colcount
+aria-colindex
+aria-colspan
</ins><span class="cx"> aria-controls
</span><span class="cx"> aria-current
</span><span class="cx"> aria-describedby
</span><span class="lines">@@ -45,6 +48,9 @@
</span><span class="cx"> aria-relevant
</span><span class="cx"> aria-required
</span><span class="cx"> aria-roledescription
</span><ins>+aria-rowcount
+aria-rowindex
+aria-rowspan
</ins><span class="cx"> aria-selected
</span><span class="cx"> aria-setsize
</span><span class="cx"> aria-sort
</span></span></pre>
</div>
</div>
</body>
</html>