<!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>[198819] 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/198819">198819</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-03-29 19:02:47 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: VoiceOver not announcing the right header information for table on iOS
https://bugs.webkit.org/show_bug.cgi?id=155907
Reviewed by Chris Fleizach.
Source/WebCore:
Make sure we consider the case where header elements size does not equal to
row size.
Test: accessibility/ios-simulator/table-row-column-headers.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
LayoutTests:
* accessibility/ios-simulator/table-row-column-headers-expected.txt: Added.
* accessibility/ios-simulator/table-row-column-headers.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortablerowcolumnheadersexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatortablerowcolumnheadershtml">trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198818 => 198819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-30 01:31:33 UTC (rev 198818)
+++ trunk/LayoutTests/ChangeLog 2016-03-30 02:02:47 UTC (rev 198819)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-29 Nan Wang <n_wang@apple.com>
+
+ AX: VoiceOver not announcing the right header information for table on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=155907
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ios-simulator/table-row-column-headers-expected.txt: Added.
+ * accessibility/ios-simulator/table-row-column-headers.html: Added.
+
</ins><span class="cx"> 2016-03-29 Dana Burkart and Matthew Hanson <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: JS PrettyPrinting in do/while loops, "while" should be on the same line as "}" if there was a closing brace
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortablerowcolumnheadersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers-expected.txt (0 => 198819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers-expected.txt 2016-03-30 02:02:47 UTC (rev 198819)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+ColHeader1 ColHeader2
+Rowheader1 content1 content2 content3
+RowHeader2 content4 content5 content6
+content7 content8 content9
+This test makes sure that cells are getting the correct header elements.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Verifying "content1" with col header: "ColHeader1" row header: "Rowheader1".
+PASS cell.headerElementAtIndex(0).description is colDescription
+PASS cell.headerElementAtIndex(1).description is rowDescription
+
+
+Verifying "content2" with col header: "ColHeader2" row header: "Rowheader1".
+PASS cell.headerElementAtIndex(0).description is colDescription
+PASS cell.headerElementAtIndex(1).description is rowDescription
+
+
+Verifying "content7" with col header: "ColHeader1" row header: "Rowheader2".
+PASS cell.headerElementAtIndex(0).description is colDescription
+PASS cell.headerElementAtIndex(1).description is rowDescription
+
+
+Verifying "content9" with col header: "ColHeader2" row header: "Rowheader2".
+PASS cell.headerElementAtIndex(0).description is colDescription
+PASS cell.headerElementAtIndex(1).description is rowDescription
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatortablerowcolumnheadershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers.html (0 => 198819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/table-row-column-headers.html 2016-03-30 02:02:47 UTC (rev 198819)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+var successfullyParsed = false;
+</script>
+<style>
+table, th, td {
+ border: 1px solid black;
+}
+</style>
+</head>
+<body>
+
+<table>
+<thead><tr>
+<td></td>
+<th aria-label="ColHeader1">ColHeader1</th>
+<th aria-label="ColHeader2" colspan="2">ColHeader2</th>
+</tr></thead>
+
+<tbody>
+<tr>
+<th aria-label="Rowheader1">Rowheader1</th>
+<td id="content1">content1</td>
+<td id="content2">content2</td>
+<td>content3</td>
+</tr>
+<tr>
+<th aria-label="Rowheader2" rowspan="2">RowHeader2</th>
+<td>content4</td>
+<td>content5</td>
+<td>content6</td>
+</tr>
+<tr>
+<td id="content7">content7</td>
+<td>content8</td>
+<td id="content9">content9</td>
+</tr>
+</tbody>
+</table>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This test makes sure that cells are getting the correct header elements.");
+
+ if (window.accessibilityController) {
+
+ var cell;
+ var colDescription, rowDescription;
+ var rowHeaderLabel1 = "Rowheader1";
+ var rowHeaderLabel2 = "Rowheader2";
+ var colHeaderLabel1 = "ColHeader1";
+ var colHeaderLabel2 = "ColHeader2";
+
+ verifyCellAndHeaders("content1", colHeaderLabel1, rowHeaderLabel1);
+ verifyCellAndHeaders("content2", colHeaderLabel2, rowHeaderLabel1);
+ verifyCellAndHeaders("content7", colHeaderLabel1, rowHeaderLabel2);
+ verifyCellAndHeaders("content9", colHeaderLabel2, rowHeaderLabel2);
+ }
+
+ function verifyCellAndHeaders(cellID, colHeader, rowHeader) {
+ cell = accessibilityController.accessibleElementById(cellID);
+ colDescription = "AXLabel: " + colHeader;
+ rowDescription = "AXLabel: " + rowHeader;
+ debug("Verifying \"" + cellID + "\" with col header: \"" + colHeader + "\" row header: \"" + rowHeader + "\".");
+ shouldBe("cell.headerElementAtIndex(0).description", "colDescription");
+ shouldBe("cell.headerElementAtIndex(1).description", "rowDescription");
+ debug("\n");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198818 => 198819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-30 01:31:33 UTC (rev 198818)
+++ trunk/Source/WebCore/ChangeLog 2016-03-30 02:02:47 UTC (rev 198819)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-29 Nan Wang <n_wang@apple.com>
+
+ AX: VoiceOver not announcing the right header information for table on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=155907
+
+ Reviewed by Chris Fleizach.
+
+ Make sure we consider the case where header elements size does not equal to
+ row size.
+
+ Test: accessibility/ios-simulator/table-row-column-headers.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
+
</ins><span class="cx"> 2016-03-29 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r198782): CGImageSourceUpdateData() is called twice with the same data every time ImageSource::setData() is called
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (198818 => 198819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-03-30 01:31:33 UTC (rev 198818)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-03-30 02:02:47 UTC (rev 198819)
</span><span class="lines">@@ -1057,13 +1057,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned rowRangeIndex = static_cast<unsigned>(rowRange.first);
</span><del>- if (rowRangeIndex < rowHeaders.size()) {
- RefPtr<AccessibilityObject> rowHeader = rowHeaders[rowRange.first];
- AccessibilityObjectWrapper* wrapper = rowHeader->wrapper();
- if (wrapper)
- [headers addObject:wrapper];
</del><ins>+ // We should consider the cases where the row number does NOT match the index in
+ // rowHeaders, the most common case is when row0/col0 does not have a header.
+ for (const auto& rowHeader : rowHeaders) {
+ if (!is<AccessibilityTableCell>(*rowHeader))
+ break;
+ std::pair<unsigned, unsigned> rowHeaderRange;
+ downcast<AccessibilityTableCell>(*rowHeader).rowIndexRange(rowHeaderRange);
+ if (rowRangeIndex >= rowHeaderRange.first && rowRangeIndex < rowHeaderRange.first + rowHeaderRange.second) {
+ if (AccessibilityObjectWrapper* wrapper = rowHeader->wrapper())
+ [headers addObject:wrapper];
+ break;
+ }
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return headers;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>