<!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>[202194] 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/202194">202194</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 18:19:13 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: HTML indeterminate IDL attribute not mapped to checkbox value=2 for native checkboxes
https://bugs.webkit.org/show_bug.cgi?id=158876
<rdar://problem/26842619>
Reviewed by Joanmarie Diggs.
Source/WebCore:
The indeterminate state was not being reported for native checkboxes.
Also the isIndeterminate() method was relying on whether the appearance changed, which does not happen on Mac, so that
was not being reported correctly. Changed that to check the actual attribute.
Test: accessibility/checkbox-mixed-value.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::isIndeterminate):
(WebCore::AccessibilityNodeObject::isPressed):
(WebCore::AccessibilityNodeObject::checkboxOrRadioValue):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::checkboxOrRadioValue):
LayoutTests:
* accessibility/checkbox-mixed-value-expected.txt: Added.
* accessibility/checkbox-mixed-value.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="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitycheckboxmixedvalueexpectedtxt">trunk/LayoutTests/accessibility/checkbox-mixed-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitycheckboxmixedvaluehtml">trunk/LayoutTests/accessibility/checkbox-mixed-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202193 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-18 01:09:09 UTC (rev 202193)
+++ trunk/LayoutTests/ChangeLog 2016-06-18 01:19:13 UTC (rev 202194)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML indeterminate IDL attribute not mapped to checkbox value=2 for native checkboxes
+ https://bugs.webkit.org/show_bug.cgi?id=158876
+ <rdar://problem/26842619>
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/checkbox-mixed-value-expected.txt: Added.
+ * accessibility/checkbox-mixed-value.html: Added.
+
</ins><span class="cx"> 2016-06-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r199819): CrashTracer: [GraphicsContext3D::getInternalFramebufferSize
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitycheckboxmixedvalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/checkbox-mixed-value-expected.txt (0 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/checkbox-mixed-value-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/checkbox-mixed-value-expected.txt 2016-06-18 01:19:13 UTC (rev 202194)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Tests whether mixed values are reported properly on native checkboxes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+1: AXRole: AXCheckBox
+Indeterminate status: true
+
+2: AXRole: AXCheckBox
+Indeterminate status: false
+
+3: AXRole: AXCheckBox
+Indeterminate status: false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitycheckboxmixedvaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/checkbox-mixed-value.html (0 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/checkbox-mixed-value.html (rev 0)
+++ trunk/LayoutTests/accessibility/checkbox-mixed-value.html 2016-06-18 01:19:13 UTC (rev 202194)
</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>
+</head>
+<body id="body">
+
+<div id="content">
+
+<input type="checkbox" id="element1" indeterminate="true">
+<input type="checkbox" id="element2" indeterminate="false">
+<input type="checkbox" id="element3">
+
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("Tests whether mixed values are reported properly on native checkboxes.");
+
+ if (window.accessibilityController) {
+ for (var i = 1; i <= 3; i++) {
+ var element = accessibilityController.accessibleElementById("element" + i);
+ debug(i + ": " + element.role);
+ debug("Indeterminate status: " + element.isIndeterminate + "\n");
+ }
+
+ document.getElementById("content").style.visibility = "hidden";
+ }
+
+</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 (202193 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-18 01:09:09 UTC (rev 202193)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 01:19:13 UTC (rev 202194)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML indeterminate IDL attribute not mapped to checkbox value=2 for native checkboxes
+ https://bugs.webkit.org/show_bug.cgi?id=158876
+ <rdar://problem/26842619>
+
+ Reviewed by Joanmarie Diggs.
+
+ The indeterminate state was not being reported for native checkboxes.
+
+ Also the isIndeterminate() method was relying on whether the appearance changed, which does not happen on Mac, so that
+ was not being reported correctly. Changed that to check the actual attribute.
+
+ Test: accessibility/checkbox-mixed-value.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isIndeterminate):
+ (WebCore::AccessibilityNodeObject::isPressed):
+ (WebCore::AccessibilityNodeObject::checkboxOrRadioValue):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::checkboxOrRadioValue):
+
</ins><span class="cx"> 2016-06-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r199819): CrashTracer: [GraphicsContext3D::getInternalFramebufferSize
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (202193 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-06-18 01:09:09 UTC (rev 202193)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-06-18 01:19:13 UTC (rev 202194)
</span><span class="lines">@@ -665,8 +665,7 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityNodeObject::isIndeterminate() const
</span><span class="cx"> {
</span><del>- auto* node = this->node();
- return is<HTMLInputElement>(node) && downcast<HTMLInputElement>(*node).shouldAppearIndeterminate();
</del><ins>+ return equalLettersIgnoringASCIICase(getAttribute(indeterminateAttr), "true");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityNodeObject::isPressed() const
</span><span class="lines">@@ -938,7 +937,7 @@
</span><span class="cx"> AccessibilityButtonState AccessibilityNodeObject::checkboxOrRadioValue() const
</span><span class="cx"> {
</span><span class="cx"> if (isNativeCheckboxOrRadio())
</span><del>- return isChecked() ? ButtonStateOn : ButtonStateOff;
</del><ins>+ return isIndeterminate() ? ButtonStateMixed : isChecked() ? ButtonStateOn : ButtonStateOff;
</ins><span class="cx">
</span><span class="cx"> return AccessibilityObject::checkboxOrRadioValue();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (202193 => 202194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-06-18 01:09:09 UTC (rev 202193)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-06-18 01:19:13 UTC (rev 202194)
</span><span class="lines">@@ -2498,7 +2498,7 @@
</span><span class="cx"> return ButtonStateMixed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (equalLettersIgnoringASCIICase(getAttribute(indeterminateAttr), "true"))
</del><ins>+ if (isIndeterminate())
</ins><span class="cx"> return ButtonStateMixed;
</span><span class="cx">
</span><span class="cx"> return ButtonStateOff;
</span></span></pre>
</div>
</div>
</body>
</html>