<!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>[167558] 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/167558">167558</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 18:25:28 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Malformed tables exposing incorrect col and colSpans
https://bugs.webkit.org/show_bug.cgi?id=131796
Reviewed by Darin Adler.
Source/WebCore:
Test: accessibility/table-incorrect-colspan-cell.html
When a developer has specified malformed colspans, accessibility is reporting those values instead of the effective column information.
* accessibility/AccessibilityTableCell.cpp:
(WebCore::AccessibilityTableCell::columnIndexRange):
LayoutTests:
* accessibility/table-incorrect-colspan-cell-expected.txt: Added.
* accessibility/table-incorrect-colspan-cell.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="#trunkLayoutTestsaccessibilitytableincorrectcolspancellexpectedtxt">trunk/LayoutTests/accessibility/table-incorrect-colspan-cell-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytableincorrectcolspancellhtml">trunk/LayoutTests/accessibility/table-incorrect-colspan-cell.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167557 => 167558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-20 01:22:06 UTC (rev 167557)
+++ trunk/LayoutTests/ChangeLog 2014-04-20 01:25:28 UTC (rev 167558)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-19 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Malformed tables exposing incorrect col and colSpans
+ https://bugs.webkit.org/show_bug.cgi?id=131796
+
+ Reviewed by Darin Adler.
+
+ * accessibility/table-incorrect-colspan-cell-expected.txt: Added.
+ * accessibility/table-incorrect-colspan-cell.html: Added.
+
</ins><span class="cx"> 2014-04-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Unreviewed gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytableincorrectcolspancellexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-incorrect-colspan-cell-expected.txt (0 => 167558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-incorrect-colspan-cell-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/table-incorrect-colspan-cell-expected.txt 2014-04-20 01:25:28 UTC (rev 167558)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+Home Help Login
+ Tip us on news
+This tests the rowRange and columnRange attributes of table cells in a table with colspans that are invalid.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Table: Rows: 2, Columns: 3
+[Table cell at row: 0, column: 0] Row range: {0, 1}, Column range: {0, 1}
+ PASSED Cell is same cell at (0, 0)
+[Table cell at row: 1, column: 0] Row range: {1, 1}, Column range: {0, 2}
+ PASSED Cell is same cell at (1, 0)
+ PASSED Cell is same cell at (1, 1)
+[Table cell at row: 1, column: 1] Row range: {1, 1}, Column range: {0, 2}
+ PASSED Cell is same cell at (1, 0)
+ PASSED Cell is same cell at (1, 1)
+[Table cell at row: 1, column: 2] Row range: {1, 1}, Column range: {2, 1}
+ PASSED Cell is same cell at (1, 2)
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytableincorrectcolspancellhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-incorrect-colspan-cell.html (0 => 167558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-incorrect-colspan-cell.html (rev 0)
+++ trunk/LayoutTests/accessibility/table-incorrect-colspan-cell.html 2014-04-20 01:25:28 UTC (rev 167558)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<table id="table" border="1" cellspacing="1">
+<tbody><tr><td><table border="1" width="100%"><tbody>
+<tr><td>Home</td>
+<td>Help</td>
+<td>Login</td></tr></tbody></table>
+</td></tr><tr><td colspan="4">
+<input type="text"></td>
+<td colspan="2" id="tablecell">Tip us on news</td>
+</tr></tbody></table>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests the rowRange and columnRange attributes of table cells in a table with colspans that are invalid.");
+
+ function parseRangeString(string) {
+ string = string.replace(/({|})/, "");
+ var nums = string.split(",");
+ return new Array(parseInt(nums[0]), parseInt(nums[1]));
+ }
+
+ if (window.accessibilityController) {
+ var table = accessibilityController.accessibleElementById("table");
+ var rowCount = table.rowCount;
+ var columnCount = table.columnCount;
+ debug("Table: Rows: " + rowCount + ", Columns: " + columnCount);
+ for (var row = 0; row < rowCount; row++) {
+ for (var col = 0; col < columnCount; col++) {
+ var tableCell = table.cellForColumnAndRow(col, row);
+ if (!tableCell || !tableCell.isValid)
+ continue;
+
+ var rowIndexRange = tableCell.rowIndexRange();
+ var colIndexRange = tableCell.columnIndexRange();
+ debug("[Table cell at row: " + row + ", column: " + col + "] Row range: " + rowIndexRange + ", Column range: " + colIndexRange);
+ var rowInfo = parseRangeString(rowIndexRange);
+ var colInfo = parseRangeString(colIndexRange);
+ for (var subrow = rowInfo[0]; subrow < rowInfo[0] + rowInfo[1]; subrow++) {
+ for (var subcol = colInfo[0]; subcol < colInfo[0] + colInfo[1]; subcol++) {
+ var testTableCell = table.cellForColumnAndRow(subcol, subrow);
+ if (!testTableCell || !testTableCell.isValid)
+ continue;
+
+ var same = tableCell.isEqual(testTableCell);
+ var passed = same ? "PASSED" : "FAILED";
+ debug("\t" + passed + " Cell is same cell at (" + subrow + ", " + subcol + ")");
+ }
+ }
+ }
+ }
+ }
+
+</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 (167557 => 167558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-20 01:22:06 UTC (rev 167557)
+++ trunk/Source/WebCore/ChangeLog 2014-04-20 01:25:28 UTC (rev 167558)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-19 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Malformed tables exposing incorrect col and colSpans
+ https://bugs.webkit.org/show_bug.cgi?id=131796
+
+ Reviewed by Darin Adler.
+
+ Test: accessibility/table-incorrect-colspan-cell.html
+
+ When a developer has specified malformed colspans, accessibility is reporting those values instead of the effective column information.
+
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::columnIndexRange):
+
</ins><span class="cx"> 2014-04-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the CSS JIT compile for ARM64
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (167557 => 167558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-04-20 01:22:06 UTC (rev 167557)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-04-20 01:25:28 UTC (rev 167558)
</span><span class="lines">@@ -248,9 +248,9 @@
</span><span class="cx"> if (!m_renderer || !m_renderer->isTableCell())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderTableCell* renderCell = toRenderTableCell(m_renderer);
- columnRange.first = renderCell->col();
- columnRange.second = renderCell->colSpan();
</del><ins>+ const RenderTableCell& cell = *toRenderTableCell(m_renderer);
+ columnRange.first = cell.table()->colToEffCol(cell.col());
+ columnRange.second = cell.table()->colToEffCol(cell.col() + cell.colSpan()) - columnRange.first;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* AccessibilityTableCell::titleUIElement() const
</span></span></pre>
</div>
</div>
</body>
</html>