<!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>[163320] 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/163320">163320</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 12:34:39 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit should support @headers/@id for complex accessible web tables
https://bugs.webkit.org/show_bug.cgi?id=128114
Reviewed by Darin Adler.
Source/WebCore:
Expose the headers attribute for table cells to accessibility.
Test: platform/mac/accessibility/table-headers-attribute.html
* accessibility/AccessibilityTableCell.cpp:
(WebCore::AccessibilityTableCell::columnHeaders):
LayoutTests:
* platform/mac/accessibility/table-headers-attribute-expected.txt: Added.
* platform/mac/accessibility/table-headers-attribute.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="#trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp">trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytableheadersattributeexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitytableheadersattributehtml">trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163319 => 163320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-02-03 20:26:09 UTC (rev 163319)
+++ trunk/LayoutTests/ChangeLog        2014-02-03 20:34:39 UTC (rev 163320)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-03 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WebKit should support @headers/@id for complex accessible web tables
+ https://bugs.webkit.org/show_bug.cgi?id=128114
+
+ Reviewed by Darin Adler.
+
+ * platform/mac/accessibility/table-headers-attribute-expected.txt: Added.
+ * platform/mac/accessibility/table-headers-attribute.html: Added.
+
</ins><span class="cx"> 2014-02-03 Jessie Berlin <jberlin@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r163299 since it broke the ML 32-bit Release build
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytableheadersattributeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute-expected.txt (0 => 163320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute-expected.txt         (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute-expected.txt        2014-02-03 20:34:39 UTC (rev 163320)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Course Name        Course Tutor        Summary        Code        Fee
+After the Civil War        Dr. John Wroughton        October        H27        Â£32        Â£32
+This tests that the headers attribute returns the correct headers for a table cell.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS colHeaders.length is 3
+PASS colHeaders[0].isEqual(table.cellForColumnAndRow(0, 0)) is true
+PASS colHeaders[1].isEqual(table.cellForColumnAndRow(2, 0)) is true
+PASS colHeaders[2].isEqual(table.cellForColumnAndRow(4, 0)) is true
+PASS colHeaders.length is 2
+PASS colHeaders[0].isEqual(table.cellForColumnAndRow(3, 0)) is true
+PASS colHeaders[1].isEqual(table.cellForColumnAndRow(2, 0)) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitytableheadersattributehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute.html (0 => 163320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute.html         (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/table-headers-attribute.html        2014-02-03 20:34:39 UTC (rev 163320)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<table border="1" cellpadding="5" cellspacing="2" id="table">
+ <tbody>
+ <tr>
+ <th id="header1" scope="col" abbr="Name">Course Name</th>
+ <th id="header2" scope="col" abbr="Tutor">Course Tutor</th>
+ <th id="header3" scope="col">Summary</th>
+ <th id="header4" scope="col">Code</th>
+ <th id="header5" scope="col" colspan="2">Fee</th>
+ </tr>
+ <tr>
+ <td id="cell1" headers="header1 header3 header5">After the Civil War</td>
+ <td id="cell2" headers="header4 header3 header6">Dr. John Wroughton</td>
+ <td>October</td>
+ <td>H27</td>
+ <td>£32</td>
+ <td>£32</td>
+ </tr>
+</tbody></table>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that the headers attribute returns the correct headers for a table cell.");
+
+ if (window.accessibilityController) {
+
+ var table = accessibilityController.accessibleElementById("table");
+
+ // The first cell references header1 header3 header5.
+ var cell1 = table.cellForColumnAndRow(0, 1);
+ var colHeaders = cell1.columnHeaders();
+ shouldBe("colHeaders.length", "3");
+ shouldBeTrue("colHeaders[0].isEqual(table.cellForColumnAndRow(0, 0))");
+ shouldBeTrue("colHeaders[1].isEqual(table.cellForColumnAndRow(2, 0))");
+ shouldBeTrue("colHeaders[2].isEqual(table.cellForColumnAndRow(4, 0))");
+
+ // The second cell references header4 header3 and a non-existent header6.
+ var cell2 = table.cellForColumnAndRow(1, 1);
+ var colHeaders = cell2.columnHeaders();
+ shouldBe("colHeaders.length", "2");
+ shouldBeTrue("colHeaders[0].isEqual(table.cellForColumnAndRow(3, 0))");
+ shouldBeTrue("colHeaders[1].isEqual(table.cellForColumnAndRow(2, 0))");
+ }
+
+</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 (163319 => 163320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-02-03 20:26:09 UTC (rev 163319)
+++ trunk/Source/WebCore/ChangeLog        2014-02-03 20:34:39 UTC (rev 163320)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-03 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WebKit should support @headers/@id for complex accessible web tables
+ https://bugs.webkit.org/show_bug.cgi?id=128114
+
+ Reviewed by Darin Adler.
+
+ Expose the headers attribute for table cells to accessibility.
+
+ Test: platform/mac/accessibility/table-headers-attribute.html
+
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::columnHeaders):
+
</ins><span class="cx"> 2014-02-03 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CTTE: RenderSVGGradientStop always has a SVGStopElement.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (163319 => 163320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp        2014-02-03 20:26:09 UTC (rev 163319)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp        2014-02-03 20:34:39 UTC (rev 163320)
</span><span class="lines">@@ -148,6 +148,19 @@
</span><span class="cx"> if (!parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Choose columnHeaders as the place where the "headers" attribute is reported.
+ AXObjectCache* cache = axObjectCache();
+ Vector<Element*> elements;
+ elementsFromAttribute(elements, headersAttr);
+ for (auto& element : elements) {
+ if (AccessibilityObject* object = cache->getOrCreate(element))
+ headers.append(object);
+ }
+
+ // If the headers attribute returned valid values, then do not further search for column headers.
+ if (!headers.isEmpty())
+ return;
+
</ins><span class="cx"> std::pair<unsigned, unsigned> rowRange;
</span><span class="cx"> rowIndexRange(rowRange);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>