<!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>[187068] branches/safari-601.1-branch</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/187068">187068</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 21:37:20 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186974">r186974</a>. rdar://problem/21106945</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreaccessibilityAccessibilityTablecpp">branches/safari-601.1-branch/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsaccessibilityiframewithincellexpectedtxt">branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsaccessibilityiframewithincellhtml">branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187067 => 187068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:17 UTC (rev 187067)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:20 UTC (rev 187068)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186974. rdar://problem/21106945
+
+ 2015-07-17 Nan Wang <n_wang@apple.com>
+
+ AX: iframe within table cell is inaccessible to VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=147001
+ <rdar://problem/21106945>
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/iframe-within-cell-expected.txt: Added.
+ * accessibility/iframe-within-cell.html: Added.
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186968. rdar://problem/21359811
</span><span class="cx">
</span><span class="cx"> 2015-07-17 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsaccessibilityiframewithincellexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell-expected.txt (0 => 187068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell-expected.txt 2015-07-21 04:37:20 UTC (rev 187068)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests iframe within a cell is accessible.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Role for iframe cell is: AXRole: AXCell .
+
+Cell A Cell C
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsaccessibilityiframewithincellhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell.html (0 => 187068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/accessibility/iframe-within-cell.html 2015-07-21 04:37:20 UTC (rev 187068)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+<script>
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function runTest()
+{
+ document.getElementById("frame_cell").focus()
+ if (window.accessibilityController) {
+ document.body.focus();
+ var frameElement = accessibilityController.accessibleElementById("frame_cell");
+ debug("Role for iframe cell is: " + frameElement.role + " .\n");
+ }
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<table cellpadding=0 cellspacing=0 border=2>
+<tr>
+<td> Cell A </td>
+<td id="frame_cell" description="Cell B"><iframe src="about:blank" width="100%"></iframe></td>
+<td> Cell C </td>
+</tr>
+</table>
+
+<script>
+description("This tests iframe within a cell is accessible.");
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187067 => 187068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:37:17 UTC (rev 187067)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:37:20 UTC (rev 187068)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186974. rdar://problem/21106945
+
+ 2015-07-17 Nan Wang <n_wang@apple.com>
+
+ AX: iframe within table cell is inaccessible to VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=147001
+ <rdar://problem/21106945>
+
+ Reviewed by Chris Fleizach.
+
+ When a table cell is created before its parent table determines if it should be ignored or not,
+ the table cell may cache the wrong role. Fix that by allowing each table cell to update its role
+ after the table makes this determination.
+
+ Test: accessibility/iframe-within-cell.html
+
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::addChildren):
+ (WebCore::AccessibilityTable::addChildrenFromSection):
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186968. rdar://problem/21359811
</span><span class="cx">
</span><span class="cx"> 2015-07-17 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/accessibility/AccessibilityTable.cpp (187067 => 187068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/accessibility/AccessibilityTable.cpp 2015-07-21 04:37:17 UTC (rev 187067)
+++ branches/safari-601.1-branch/Source/WebCore/accessibility/AccessibilityTable.cpp 2015-07-21 04:37:20 UTC (rev 187068)
</span><span class="lines">@@ -409,6 +409,16 @@
</span><span class="cx"> AccessibilityObject* headerContainerObject = headerContainer();
</span><span class="cx"> if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored())
</span><span class="cx"> m_children.append(headerContainerObject);
</span><ins>+
+ // Sometimes the cell gets the wrong role initially because it is created before the parent
+ // determines whether it is an accessibility table. Iterate all the cells and allow them to
+ // update their roles now that the table knows its status.
+ // see bug: https://bugs.webkit.org/show_bug.cgi?id=147001
+ for (const auto& row : m_rows) {
+ for (const auto& cell : row->children())
+ cell->updateAccessibilityRole();
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityTable::addChildrenFromSection(RenderTableSection* tableSection, unsigned& maxColumnCount)
</span></span></pre>
</div>
</div>
</body>
</html>