<!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>[167225] releases/WebKitGTK/webkit-2.4</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/167225">167225</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-14 02:17:13 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164249">r164249</a> - AX: Invalid cast in WebCore::AccessibilityTable::isDataTable (CRBug 280352)
<https://webkit.org/b/128925>
<rdar://problem/16087351>
Merged from Blink (patch by Dominic Mazzoni):
https://src.chromium.org/viewvc/blink?revision=159711&view=revision
Reviewed by Oliver Hunt.
Source/WebCore:
Don't cast to a table cell element unless we are sure it is one.
Test: accessibility/display-table-cell-causes-crash.html
* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::isDataTable):
LayoutTests:
* accessibility/display-table-cell-causes-crash-expected.txt: Added.
* accessibility/display-table-cell-causes-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreaccessibilityAccessibilityTablecpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsaccessibilitydisplaytablecellcausescrashexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsaccessibilitydisplaytablecellcausescrashhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (167224 => 167225)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-14 09:11:16 UTC (rev 167224)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-14 09:17:13 UTC (rev 167225)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Invalid cast in WebCore::AccessibilityTable::isDataTable (CRBug 280352)
+ <https://webkit.org/b/128925>
+ <rdar://problem/16087351>
+
+ Merged from Blink (patch by Dominic Mazzoni):
+ https://src.chromium.org/viewvc/blink?revision=159711&view=revision
+
+ Reviewed by Oliver Hunt.
+
+ * accessibility/display-table-cell-causes-crash-expected.txt: Added.
+ * accessibility/display-table-cell-causes-crash.html: Added.
+
</ins><span class="cx"> 2014-02-16 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure that removing an iframe from the DOM tree disconnects its Frame.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsaccessibilitydisplaytablecellcausescrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash-expected.txt (0 => 167225)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash-expected.txt 2014-04-14 09:17:13 UTC (rev 167225)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+This test makes sure that an element with a display of table-cell doesn't cause a crash when accessibility code assumes it must be a TD or TH element.
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsaccessibilitydisplaytablecellcausescrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash.html (0 => 167225)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/accessibility/display-table-cell-causes-crash.html 2014-04-14 09:17:13 UTC (rev 167225)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<p id="description">This test makes sure that an element with a display of table-cell doesn't cause a crash when accessibility code assumes it must be a TD or TH element.</p>
+
+<div id="console"></div>
+
+<table></table>
+
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ // Ensure AX is loaded.
+ if (window.accessibilityController) {
+ accessibilityController.accessibleElementById("description");
+ }
+ var table = document.querySelector('table');
+ var span = document.createElement('span');
+ table.appendChild(span);
+ var div = document.createElement('div');
+ div.style.display = 'table-cell';
+ table.appendChild(div);
+ var input = document.createElement('input');
+ input.setAttribute('autofocus', 'autofocus');
+ div.appendChild(input);
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167224 => 167225)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 09:11:16 UTC (rev 167224)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 09:17:13 UTC (rev 167225)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Invalid cast in WebCore::AccessibilityTable::isDataTable (CRBug 280352)
+ <https://webkit.org/b/128925>
+ <rdar://problem/16087351>
+
+ Merged from Blink (patch by Dominic Mazzoni):
+ https://src.chromium.org/viewvc/blink?revision=159711&view=revision
+
+ Reviewed by Oliver Hunt.
+
+ Don't cast to a table cell element unless we are sure it is one.
+
+ Test: accessibility/display-table-cell-causes-crash.html
+
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::isDataTable):
+
</ins><span class="cx"> 2014-02-16 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure that removing an iframe from the DOM tree disconnects its Frame.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityTable.cpp (167224 => 167225)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-04-14 09:11:16 UTC (rev 167224)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-04-14 09:17:13 UTC (rev 167225)
</span><span class="lines">@@ -175,7 +175,9 @@
</span><span class="cx"> RenderTableCell* cell = firstBody->primaryCellAt(row, col);
</span><span class="cx"> if (!cell)
</span><span class="cx"> continue;
</span><del>- if (!cell->element())
</del><ins>+
+ Element* cellElement = cell->element();
+ if (!cellElement)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (cell->width() < 1 || cell->height() < 1)
</span><span class="lines">@@ -183,8 +185,6 @@
</span><span class="cx">
</span><span class="cx"> validCellCount++;
</span><span class="cx">
</span><del>- HTMLTableCellElement* cellElement = toHTMLTableCellElement(cell->element());
-
</del><span class="cx"> bool isTHCell = cellElement->hasTagName(thTag);
</span><span class="cx"> // If the first row is comprised of all <th> tags, assume it is a data table.
</span><span class="cx"> if (!row && isTHCell)
</span><span class="lines">@@ -194,11 +194,13 @@
</span><span class="cx"> if (!col && isTHCell)
</span><span class="cx"> headersInFirstColumnCount++;
</span><span class="cx">
</span><del>- // in this case, the developer explicitly assigned a "data" table attribute
- if (!cellElement->headers().isEmpty() || !cellElement->abbr().isEmpty()
- || !cellElement->axis().isEmpty() || !cellElement->scope().isEmpty())
- return true;
-
</del><ins>+ // In this case, the developer explicitly assigned a "data" table attribute.
+ if (cellElement->hasTagName(tdTag) || cellElement->hasTagName(thTag)) {
+ HTMLTableCellElement* tableCellElement = toHTMLTableCellElement(cellElement);
+ if (!tableCellElement->headers().isEmpty() || !tableCellElement->abbr().isEmpty()
+ || !tableCellElement->axis().isEmpty() || !tableCellElement->scope().isEmpty())
+ return true;
+ }
</ins><span class="cx"> const RenderStyle& renderStyle = cell->style();
</span><span class="cx">
</span><span class="cx"> // If the empty-cells style is set, we'll call it a data table.
</span></span></pre>
</div>
</div>
</body>
</html>