<!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>[174860] 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/174860">174860</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-10-18 08:20:38 -0700 (Sat, 18 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Tables with <colgroups> are not reporting table column headers
https://bugs.webkit.org/show_bug.cgi?id=137846
Reviewed by Mario Sanchez Prada.
Source/WebCore:
The code to search for header objects was getting stuck on anonymous RenderTableSections.
We also need to check more rows for headers, in case the first row or more is not visible or is empty.
Test: accessibility/table-column-headers-with-captions.html
* accessibility/AccessibilityTableColumn.cpp:
(WebCore::AccessibilityTableColumn::headerObject):
(WebCore::AccessibilityTableColumn::headerObjectForSection):
LayoutTests:
* accessibility/table-column-headers-with-captions-expected.txt: Added.
* accessibility/table-column-headers-with-captions.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="#trunkSourceWebCoreaccessibilityAccessibilityTableColumncpp">trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionsexpectedtxt">trunk/LayoutTests/accessibility/table-column-headers-with-captions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionshtml">trunk/LayoutTests/accessibility/table-column-headers-with-captions.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174859 => 174860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-18 10:16:33 UTC (rev 174859)
+++ trunk/LayoutTests/ChangeLog 2014-10-18 15:20:38 UTC (rev 174860)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Tables with <colgroups> are not reporting table column headers
+ https://bugs.webkit.org/show_bug.cgi?id=137846
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/table-column-headers-with-captions-expected.txt: Added.
+ * accessibility/table-column-headers-with-captions.html: Added.
+
</ins><span class="cx"> 2014-10-17 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't create cached functions that access lexicalGlobalObject()
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-column-headers-with-captions-expected.txt (0 => 174860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-column-headers-with-captions-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/table-column-headers-with-captions-expected.txt 2014-10-18 15:20:38 UTC (rev 174860)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+caption
+header1 header2
+a b
+This tests that a table with a caption and an empty colgroup will still correctly report its headers.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS colHeaders[0].isEqual(table.rowAtIndex(0).childAtIndex(0)) is true
+PASS colHeaders[1].isEqual(table.rowAtIndex(0).childAtIndex(1)) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-column-headers-with-captions.html (0 => 174860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-column-headers-with-captions.html (rev 0)
+++ trunk/LayoutTests/accessibility/table-column-headers-with-captions.html 2014-10-18 15:20:38 UTC (rev 174860)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<table id="table" width="100%" border="0" cellspacing="2" cellpadding="1">
+ <caption>caption</caption>
+ <colgroup width="100%" span="2"><col width="50%"><col width="50%"></colgroup>
+ <tbody>
+ <tr><th>header1</th><th>header2</th></tr>
+ <tr><td>a</td><td>b</td></tr>
+ </tbody>
+</table>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that a table with a caption and an empty colgroup will still correctly report its headers.");
+
+ if (window.accessibilityController) {
+
+ var table = accessibilityController.accessibleElementById("table");
+ var colHeaders = table.columnHeaders();
+
+ shouldBeTrue("colHeaders[0].isEqual(table.rowAtIndex(0).childAtIndex(0))");
+ shouldBeTrue("colHeaders[1].isEqual(table.rowAtIndex(0).childAtIndex(1))");
+ }
+
+</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 (174859 => 174860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-18 10:16:33 UTC (rev 174859)
+++ trunk/Source/WebCore/ChangeLog 2014-10-18 15:20:38 UTC (rev 174860)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Tables with <colgroups> are not reporting table column headers
+ https://bugs.webkit.org/show_bug.cgi?id=137846
+
+ Reviewed by Mario Sanchez Prada.
+
+ The code to search for header objects was getting stuck on anonymous RenderTableSections.
+ We also need to check more rows for headers, in case the first row or more is not visible or is empty.
+
+ Test: accessibility/table-column-headers-with-captions.html
+
+ * accessibility/AccessibilityTableColumn.cpp:
+ (WebCore::AccessibilityTableColumn::headerObject):
+ (WebCore::AccessibilityTableColumn::headerObjectForSection):
+
</ins><span class="cx"> 2014-10-18 KwangHyuk Kim <hyuki.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] build break occurs on webkit efl build.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableColumncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp (174859 => 174860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2014-10-18 10:16:33 UTC (rev 174859)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2014-10-18 15:20:38 UTC (rev 174860)
</span><span class="lines">@@ -98,8 +98,12 @@
</span><span class="cx"> if (auto* headerObject = headerObjectForSection(table.header(), false))
</span><span class="cx"> return headerObject;
</span><span class="cx">
</span><del>- // now try for <th> tags in the first body
- return headerObjectForSection(table.firstBody(), true);
</del><ins>+ RenderTableSection* bodySection = table.firstBody();
+ while (bodySection && bodySection->isAnonymous())
+ bodySection = table.sectionBelow(bodySection, SkipEmptySections);
+
+ // now try for <th> tags in the first body. If the first body is
+ return headerObjectForSection(bodySection, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* AccessibilityTableColumn::headerObjectForSection(RenderTableSection* section, bool thTagRequired)
</span><span class="lines">@@ -117,22 +121,30 @@
</span><span class="cx"> RenderTableCell* cell = nullptr;
</span><span class="cx"> // also account for cells that have a span
</span><span class="cx"> for (int testCol = m_columnIndex; testCol >= 0; --testCol) {
</span><del>- RenderTableCell* testCell = section->primaryCellAt(0, testCol);
- if (!testCell)
- continue;
</del><span class="cx">
</span><del>- // we've reached a cell that doesn't even overlap our column
- // it can't be our header
- if ((testCell->col() + (testCell->colSpan()-1)) < m_columnIndex)
</del><ins>+ // Run down the rows in case initial rows are invalid (like when a <caption> is used).
+ unsigned rowCount = section->numRows();
+ for (unsigned testRow = 0; testRow < rowCount; testRow++) {
+ RenderTableCell* testCell = section->primaryCellAt(testRow, testCol);
+ // No cell at this index, keep checking more rows and columns.
+ if (!testCell)
+ continue;
+
+ // If we've reached a cell that doesn't even overlap our column it can't be the header.
+ if ((testCell->col() + (testCell->colSpan()-1)) < m_columnIndex)
+ break;
+
+ // If this does not have an element (like a <caption>) then check the next row
+ if (!testCell->element())
+ continue;
+
+ // If th is required, but we found an element that doesn't have a th tag, we can stop looking.
+ if (thTagRequired && !testCell->element()->hasTagName(thTag))
+ break;
+
+ cell = testCell;
</ins><span class="cx"> break;
</span><del>-
- if (!testCell->element())
- continue;
-
- if (thTagRequired && !testCell->element()->hasTagName(thTag))
- continue;
-
- cell = testCell;
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!cell)
</span></span></pre>
</div>
</div>
</body>
</html>