<!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>[160789] 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/160789">160789</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 12:40:26 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: make aria-hidden=false work with subtrees
https://bugs.webkit.org/show_bug.cgi?id=125592
Reviewed by Mario Sanchez Prada.
Source/WebCore:
When a hidden object uses aria-hidden=false, that needs to apply to
the entire sub-tree (not just the object with aria-hidden on it as it does now).
Enabling this had the side effect of exposing non-rendered text nodes, so there's
some extra checks to ensure we don't include those elements in this cases.
Test: accessibility/aria-hidden-false-works-in-subtrees.html
* accessibility/AXObjectCache.cpp:
(WebCore::isNodeAriaVisible):
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::computeAccessibilityIsIgnored):
LayoutTests:
* platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt: Added.
* accessibility/aria-hidden-false-works-in-subtrees.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="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityariahiddenfalseworksinsubtreeshtml">trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariahiddenfalseworksinsubtreesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160788 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 20:37:31 UTC (rev 160788)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: make aria-hidden=false work with subtrees
+ https://bugs.webkit.org/show_bug.cgi?id=125592
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt: Added.
+ * accessibility/aria-hidden-false-works-in-subtrees.html: Added.
+
</ins><span class="cx"> 2013-12-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Flaky Test: media/video-buffered.html
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariahiddenfalseworksinsubtreeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html (0 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html (rev 0)
+++ trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div hidden aria-hidden="false" aria-label="group0">
+ <div aria-hidden="true" aria-label="group1">
+ ignore me
+ </div>
+ <div role="group" aria-label="group2">
+ <div role="button" aria-label="button1">button</div>
+ don't ignore me
+ </div>
+</div>
+
+<div id="iframe">
+<iframe onload="testiFrameContent();" aria-hidden="false" src="resources/cake.png">hidden content</iframe>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that a sub-tree within a node marked with aria-hidden=false will be exposed in the AX tree.");
+
+ var iframeChild;
+ function testiFrameContent() {
+ // Test that aria-hidden=false does NOT expose iframe fallback text.
+ var iframe = accessibilityController.accessibleElementById("iframe").childAtIndex(0).childAtIndex(0);
+
+ debug("Non-rendered iframe content should not be visible when aria-hidden=true. The first child should be a group and NOT static text.");
+ iframeChild = iframe.childAtIndex(0);
+ debug("iFrame child role: " + iframeChild.role);
+
+ finishJSTest();
+ }
+
+ function dumpAccessibilityChildren(element, level) {
+ if (!element) {
+ return;
+ }
+ var indent = "";
+ for (var k = 0; k < level; k++) { indent += " "; }
+ debug(indent + element.role + "\n" + indent + element.description + "\n");
+ var childrenCount = element.childrenCount;
+ for (var k = 0; k < childrenCount; k++) {
+ dumpAccessibilityChildren(element.childAtIndex(k), level+1);
+ }
+ }
+
+ if (window.accessibilityController) {
+ window.jsTestIsAsync = true;
+
+ var root = accessibilityController.rootElement.childAtIndex(0).childAtIndex(0);
+ dumpAccessibilityChildren(root, 0);
+}
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariahiddenfalseworksinsubtreesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt (0 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-hidden-false-works-in-subtrees-expected.txt 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+
+This tests that a sub-tree within a node marked with aria-hidden=false will be exposed in the AX tree.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+AXRole: AXGroup
+AXDescription: group0
+
+ AXRole: AXGroup
+ AXDescription: group2
+
+ AXRole: AXButton
+ AXDescription: button1
+
+ AXRole: AXStaticText
+ AXDescription:
+
+Non-rendered iframe content should not be visible when aria-hidden=true. The first child should be a group and NOT static text.
+iFrame child role: AXRole: AXGroup
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160788 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 20:37:31 UTC (rev 160788)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-18 Chris Fleizach <cfleizach@apple.com>
+
+ AX: make aria-hidden=false work with subtrees
+ https://bugs.webkit.org/show_bug.cgi?id=125592
+
+ Reviewed by Mario Sanchez Prada.
+
+ When a hidden object uses aria-hidden=false, that needs to apply to
+ the entire sub-tree (not just the object with aria-hidden on it as it does now).
+
+ Enabling this had the side effect of exposing non-rendered text nodes, so there's
+ some extra checks to ensure we don't include those elements in this cases.
+
+ Test: accessibility/aria-hidden-false-works-in-subtrees.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::isNodeAriaVisible):
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::computeAccessibilityIsIgnored):
+
</ins><span class="cx"> 2013-12-18 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify bindings codegen for adding getOwnPropertySlot overrides
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (160788 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2013-12-18 20:37:31 UTC (rev 160788)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -977,10 +977,19 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!node->isElementNode())
- return false;
</del><ins>+ // To determine if a node is ARIA visible, we need to check the parent hierarchy to see if anyone specifies
+ // aria-hidden explicitly.
+ for (Node* testNode = node; testNode; testNode = testNode->parentNode()) {
+ if (testNode->isElementNode()) {
+ const AtomicString& ariaHiddenValue = toElement(testNode)->fastGetAttribute(aria_hiddenAttr);
+ if (equalIgnoringCase(ariaHiddenValue, "false"))
+ return true;
+ if (equalIgnoringCase(ariaHiddenValue, "true"))
+ return false;
+ }
+ }
</ins><span class="cx">
</span><del>- return equalIgnoringCase(toElement(node)->getAttribute(aria_hiddenAttr), "false");
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AXAttributeCacheEnabler::AXAttributeCacheEnabler(AXObjectCache* cache)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (160788 => 160789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-18 20:37:31 UTC (rev 160788)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-18 20:40:26 UTC (rev 160789)
</span><span class="lines">@@ -411,6 +411,18 @@
</span><span class="cx"> ASSERT(m_initialized);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // Handle non-rendered text that is exposed through aria-hidden=false.
+ if (m_node && m_node->isTextNode() && !renderer()) {
+ // Fallback content in iframe nodes should be ignored.
+ if (m_node->parentNode() && m_node->parentNode()->hasTagName(iframeTag) && m_node->parentNode()->renderer())
+ return true;
+
+ // Whitespace only text elements should be ignored when they have no renderer.
+ String string = stringValue().stripWhiteSpace().simplifyWhiteSpace();
+ if (!string.length())
+ return true;
+ }
+
</ins><span class="cx"> // If this element is within a parent that cannot have children, it should not be exposed.
</span><span class="cx"> if (isDescendantOfBarrenParent())
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>