<!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>[178786] branches/safari-600.1.4.15-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/178786">178786</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 17:08:36 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175241">r175241</a>. rdar://problem/19419939</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsaccessibilityinputtypehiddeninariahiddenfalseexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsaccessibilityinputtypehiddeninariahiddenfalsehtml">branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (178785 => 178786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-21 01:06:43 UTC (rev 178785)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-21 01:08:36 UTC (rev 178786)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175241.
+
+ 2014-10-27 Chris Fleizach <cfleizach@apple.com>
+
+ AX: input type=hidden is being exposed when aria-hidden=false
+ https://bugs.webkit.org/show_bug.cgi?id=138106
+
+ Reviewed by Benjamin Poulain.
+
+ * accessibility/input-type-hidden-in-aria-hidden-false-expected.txt: Added.
+ * accessibility/input-type-hidden-in-aria-hidden-false.html: Added.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r175131.
</span><span class="cx">
</span><span class="cx"> 2014-10-23 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsaccessibilityinputtypehiddeninariahiddenfalseexpectedtxtfromrev175241trunkLayoutTestsaccessibilityinputtypehiddeninariahiddenfalseexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false-expected.txt (from rev 175241, trunk/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false-expected.txt) (0 => 178786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false-expected.txt 2015-01-21 01:08:36 UTC (rev 178786)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This tests that input type of hidden are not exposed when aria-hidden=false
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS content.childrenCount is 0
+PASS !content || !content.isValid() is true
+PASS content.childrenCount is 0
+PASS !content || !content.isValid() is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsaccessibilityinputtypehiddeninariahiddenfalsehtmlfromrev175241trunkLayoutTestsaccessibilityinputtypehiddeninariahiddenfalsehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false.html (from rev 175241, trunk/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false.html) (0 => 178786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/accessibility/input-type-hidden-in-aria-hidden-false.html 2015-01-21 01:08:36 UTC (rev 178786)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="content" role="group">
+ <input type="hidden">
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that input type of hidden are not exposed when aria-hidden=false");
+
+ if (window.accessibilityController) {
+ // By default, this should have no children because input type=hidden is hidden.
+ var content = accessibilityController.accessibleElementById("content");
+ shouldBe("content.childrenCount", "0");
+
+ // When aria-hidden=true, content should not even be there
+ document.getElementById("content").setAttribute("aria-hidden", "true");
+ content = accessibilityController.accessibleElementById("content");
+ shouldBeTrue("!content || !content.isValid()");
+
+ // When aria-hidden=false, we should NOT expose input type=hidden
+ document.getElementById("content").setAttribute("aria-hidden", "false");
+ content = accessibilityController.accessibleElementById("content");
+ shouldBe("content.childrenCount", "0");
+
+ // And changing back to true on the fly should have a similar effect
+ document.getElementById("content").setAttribute("aria-hidden", "true");
+ content = accessibilityController.accessibleElementById("content");
+ shouldBeTrue("!content || !content.isValid()");
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178785 => 178786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 01:06:43 UTC (rev 178785)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 01:08:36 UTC (rev 178786)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175241.
+
+ 2014-10-27 Chris Fleizach <cfleizach@apple.com>
+
+ AX: input type=hidden is being exposed when aria-hidden=false
+ https://bugs.webkit.org/show_bug.cgi?id=138106
+
+ Reviewed by Benjamin Poulain.
+
+ If an input type=hidden was inside an aria-hidden=false, it would appear because
+ the lack of a RenderObject behind that object was not blocking its adoption into the AX tree.
+ We should explicity check for whether the type is hidden and then return an appropriate role.
+
+ Test: accessibility/input-type-hidden-in-aria-hidden-false.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::determineAccessibilityRole):
+ (WebCore::AccessibilityNodeObject::computeAccessibilityIsIgnored):
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r175131.
</span><span class="cx">
</span><span class="cx"> 2014-10-23 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (178785 => 178786)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-01-21 01:06:43 UTC (rev 178785)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-01-21 01:08:36 UTC (rev 178786)
</span><span class="lines">@@ -300,7 +300,9 @@
</span><span class="cx"> return buttonRoleType();
</span><span class="cx"> if (input->isRangeControl())
</span><span class="cx"> return SliderRole;
</span><del>-
</del><ins>+ if (input->isInputTypeHidden())
+ return IgnoredRole;
+
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> const AtomicString& type = input->getAttribute(typeAttr);
</span><span class="cx"> if (equalIgnoringCase(type, "color"))
</span><span class="lines">@@ -438,6 +440,9 @@
</span><span class="cx"> if (isDescendantOfBarrenParent())
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ if (roleValue() == IgnoredRole)
+ return true;
+
</ins><span class="cx"> return m_role == UnknownRole;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>