<!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>[170661] 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/170661">170661</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-07-01 13:29:52 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
https://bugs.webkit.org/show_bug.cgi?id=134492
Reviewed by Andreas Kling.
Source/WebCore:
Support the indeterminate attribute in AX code.
Test: Update existing test: accessibility/aria-checked-mixed-value
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::checkboxOrRadioValue):
Tools:
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::isIndeterminate):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::isIndeterminate):
LayoutTests:
* accessibility/aria-checked-mixed-value-expected.txt:
* accessibility/aria-checked-mixed-value.html:
* platform/mac/accessibility/aria-checked-mixed-value-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariacheckedmixedvalueexpectedtxt">trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariacheckedmixedvaluehtml">trunk/LayoutTests/accessibility/aria-checked-mixed-value.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariacheckedmixedvalueexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-01 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
+ https://bugs.webkit.org/show_bug.cgi?id=134492
+
+ Reviewed by Andreas Kling.
+
+ * accessibility/aria-checked-mixed-value-expected.txt:
+ * accessibility/aria-checked-mixed-value.html:
+ * platform/mac/accessibility/aria-checked-mixed-value-expected.txt: Added.
+
</ins><span class="cx"> 2014-07-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [UI-side compositing] Bad spinner on news.google.com: animations need to be ordered
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariacheckedmixedvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -19,6 +19,14 @@
</span><span class="cx"> Mixed: true
</span><span class="cx">
</span><span class="cx">
</span><ins>+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: false
+
+
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariacheckedmixedvaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-checked-mixed-value.html (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-checked-mixed-value.html 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/accessibility/aria-checked-mixed-value.html 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> <div id="element2" role="menuitemradio" aria-checked="mixed"></div> <!-- treat as false for menuitemradio roles -->
</span><span class="cx"> <div id="element3" role="checkbox" aria-checked="mixed"></div>
</span><span class="cx"> <div id="element4" role="menuitemcheckbox" aria-checked="mixed"></div>
</span><ins>+<div id="element5" role="checkbox" indeterminate="true"></div>
+<div id="element6" role="checkbox" indeterminate="false"></div>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -22,7 +24,7 @@
</span><span class="cx"> description("Tests whether mixed values are reported properly.");
</span><span class="cx">
</span><span class="cx"> if (window.accessibilityController) {
</span><del>- for (var i = 1; i < 5; i++) {
</del><ins>+ for (var i = 1; i < 7; i++) {
</ins><span class="cx"> var element = accessibilityController.accessibleElementById("element" + i);
</span><span class="cx"> debug("Role: " + element.role);
</span><span class="cx"> debug("Mixed: " + element.isIndeterminate);
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariacheckedmixedvalueexpectedtxtfromrev170660trunkLayoutTestsaccessibilityariacheckedmixedvalueexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt (from rev 170660, trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt) (0 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Tests whether mixed values are reported properly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role: AXRole: AXRadioButton
+Mixed: false
+
+
+Role: AXRole: AXMenuItem
+Mixed: false
+
+
+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXMenuItem
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: false
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-01 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
+ https://bugs.webkit.org/show_bug.cgi?id=134492
+
+ Reviewed by Andreas Kling.
+
+ Support the indeterminate attribute in AX code.
+
+ Test: Update existing test: accessibility/aria-checked-mixed-value
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::checkboxOrRadioValue):
+
</ins><span class="cx"> 2014-07-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Typing an automatic text replacement phrase after a br in contenteditable is not rendered as expected
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -2085,6 +2085,9 @@
</span><span class="cx"> return ButtonStateMixed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (equalIgnoringCase(getAttribute(indeterminateAttr), "true"))
+ return ButtonStateMixed;
+
</ins><span class="cx"> return ButtonStateOff;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Tools/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-01 Chris Fleizach <cfleizach@apple.com>
+
+ AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
+ https://bugs.webkit.org/show_bug.cgi?id=134492
+
+ Reviewed by Andreas Kling.
+
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::isIndeterminate):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::isIndeterminate):
+
</ins><span class="cx"> 2014-07-01 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary calls to std::move()
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -1479,8 +1479,13 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isIndeterminate() const
</span><span class="cx"> {
</span><del>- // FIXME: implement
- return false;
</del><ins>+ BOOL result = NO;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:NSAccessibilityValueAttribute];
+ if ([value isKindOfClass:[NSNumber class]])
+ result = [value intValue] == 2;
+ END_AX_OBJC_EXCEPTIONS
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isIgnored() const
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (170660 => 170661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-07-01 20:29:52 UTC (rev 170661)
</span><span class="lines">@@ -950,8 +950,13 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isIndeterminate() const
</span><span class="cx"> {
</span><del>- // FIXME: implement
- return false;
</del><ins>+ BOOL result = NO;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:NSAccessibilityValueAttribute];
+ if ([value isKindOfClass:[NSNumber class]])
+ result = [value intValue] == 2;
+ END_AX_OBJC_EXCEPTIONS
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isExpanded() const
</span></span></pre>
</div>
</div>
</body>
</html>