<!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>[198219] 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/198219">198219</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 12:03:11 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: certain elements not included in accessibility tree
https://bugs.webkit.org/show_bug.cgi?id=155480
Reviewed by Beth Dakin.
Source/WebCore:
This test case exposed a hole in the nextSibling logic where you can get into a state where we skip content.
The fix is to check if an inline element continuation has no sibling, to fall back on to the parent case to see if that has a sibling.
Test: accessibility/double-nested-inline-element-missing-from-tree.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::nextSibling):
LayoutTests:
* accessibility/double-nested-inline-element-missing-from-tree-expected.txt: Added.
* accessibility/double-nested-inline-element-missing-from-tree.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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitydoublenestedinlineelementmissingfromtreeexpectedtxt">trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitydoublenestedinlineelementmissingfromtreehtml">trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198218 => 198219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-15 18:26:41 UTC (rev 198218)
+++ trunk/LayoutTests/ChangeLog 2016-03-15 19:03:11 UTC (rev 198219)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-15 Chris Fleizach <cfleizach@apple.com>
+
+ AX: certain elements not included in accessibility tree
+ https://bugs.webkit.org/show_bug.cgi?id=155480
+
+ Reviewed by Beth Dakin.
+
+ * accessibility/double-nested-inline-element-missing-from-tree-expected.txt: Added.
+ * accessibility/double-nested-inline-element-missing-from-tree.html: Added.
+
</ins><span class="cx"> 2016-03-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198203.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitydoublenestedinlineelementmissingfromtreeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree-expected.txt (0 => 198219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree-expected.txt 2016-03-15 19:03:11 UTC (rev 198219)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+test1
+test2
+End of test
+This tests that when you have a two nested inline continuations and the child one has no siblings, that we go back to the parent to check for its continuation.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+AXRole: AXWebArea AXValue:
+ AXRole: AXGroup AXValue:
+ AXRole: AXStaticText AXValue: test1
+ AXRole: AXGroup AXValue:
+ AXRole: AXStaticText AXValue: test2
+ AXRole: AXGroup AXValue:
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitydoublenestedinlineelementmissingfromtreehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree.html (0 => 198219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree.html (rev 0)
+++ trunk/LayoutTests/accessibility/double-nested-inline-element-missing-from-tree.html 2016-03-15 19:03:11 UTC (rev 198219)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+<script>
+ function dumpAccessibilityChildren(element, level) {
+ if (element.stringValue.indexOf('End of test') >= 0)
+ return false;
+
+ var indent = "";
+ for (var k = 0; k < level; k++) { indent += " "; }
+ debug(indent + element.role + " " + element.stringValue);
+ var childrenCount = element.childrenCount;
+ for (var k = 0; k < childrenCount; k++) {
+ if (!dumpAccessibilityChildren(element.childAtIndex(k), level+1))
+ return false;
+ }
+ return true;
+ }
+</script>
+</head>
+
+<body id="body">
+
+<span>
+ <span>
+ test1
+ <div></div>
+ </span><div>
+ test2
+ </div>
+</span>
+
+<div>End of test</div>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ if (window.accessibilityController) {
+ description("This tests that when you have a two nested inline continuations and the child one has no siblings, that we go back to the parent to check for its continuation.");
+
+ var content = accessibilityController.rootElement.childAtIndex(0);
+ dumpAccessibilityChildren(content, 0);
+ }
+ successfullyParsed = true;
+</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 (198218 => 198219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-15 18:26:41 UTC (rev 198218)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 19:03:11 UTC (rev 198219)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-15 Chris Fleizach <cfleizach@apple.com>
+
+ AX: certain elements not included in accessibility tree
+ https://bugs.webkit.org/show_bug.cgi?id=155480
+
+ Reviewed by Beth Dakin.
+
+ This test case exposed a hole in the nextSibling logic where you can get into a state where we skip content.
+ The fix is to check if an inline element continuation has no sibling, to fall back on to the parent case to see if that has a sibling.
+
+ Test: accessibility/double-nested-inline-element-missing-from-tree.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::nextSibling):
+
</ins><span class="cx"> 2016-03-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198203.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (198218 => 198219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-15 18:26:41 UTC (rev 198218)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-03-15 19:03:11 UTC (rev 198219)
</span><span class="lines">@@ -388,7 +388,8 @@
</span><span class="cx"> nextSibling = endOfContinuations(*m_renderer)->nextSibling();
</span><span class="cx">
</span><span class="cx"> // Case 5: node has no next sibling, and its parent is an inline with a continuation.
</span><del>- else if (isInlineWithContinuation(*m_renderer->parent())) {
</del><ins>+ // Case 5.1: After case 4, (the element was inline w/ continuation but had no sibling), then check it's parent.
+ if (!nextSibling && isInlineWithContinuation(*m_renderer->parent())) {
</ins><span class="cx"> auto& continuation = *downcast<RenderInline>(*m_renderer->parent()).continuation();
</span><span class="cx">
</span><span class="cx"> // Case 5a: continuation is a block - in this case the block itself is the next sibling.
</span></span></pre>
</div>
</div>
</body>
</html>