<!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>[186598] 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/186598">186598</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 11:38:39 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: <details> element should allow expand/close through AX API
https://bugs.webkit.org/show_bug.cgi?id=146549
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Allow AXExpanded to be writeable for <details> element, which, when set
will toggle the opening and closing of the element.
Post a notification when that happens as well.
Modified test: platform/mac/accessibility/details-summary.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::hierarchicalLevel):
(WebCore::AccessibilityNodeObject::setIsExpanded):
(WebCore::shouldUseAccessibilityObjectInnerText):
* accessibility/AccessibilityNodeObject.h:
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::supportsPressAction):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::canSetExpandedAttribute):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityIsAttributeSettable:]):
(-[WebAccessibilityObjectWrapper _accessibilitySetValue:forAttribute:]):
* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::toggleOpen):
LayoutTests:
* platform/mac/accessibility/details-summary-expected.txt:
* platform/mac/accessibility/details-summary.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitydetailssummaryexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitydetailssummaryhtml">trunk/LayoutTests/platform/mac/accessibility/details-summary.html</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="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/ChangeLog 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-02 Chris Fleizach <cfleizach@apple.com>
+
+ AX: <details> element should allow expand/close through AX API
+ https://bugs.webkit.org/show_bug.cgi?id=146549
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/details-summary-expected.txt:
+ * platform/mac/accessibility/details-summary.html:
+
</ins><span class="cx"> 2015-07-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Prevent crashes with plugins.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitydetailssummaryexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -12,8 +12,15 @@
</span><span class="cx"> PASS details1.isExpanded is true
</span><span class="cx"> PASS details1.childAtIndex(0).role is 'AXRole: AXGroup'
</span><span class="cx"> PASS details1.childAtIndex(0).subrole is 'AXSubrole: AXSummary'
</span><ins>+PASS details1.isAttributeSettable('AXExpanded') is true
+PASS details1.isExpanded is false
+PASS details1.isExpanded is false
+PASS details1.isExpanded is true
+PASS details1.isExpanded is true
</ins><span class="cx"> PASS details2.subrole is 'AXSubrole: AXDetails'
</span><span class="cx"> PASS details2.isExpanded is false
</span><ins>+Received AXExpandedChanged notification
+Received AXExpandedChanged notification
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitydetailssummaryhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/details-summary.html (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/details-summary.html 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/platform/mac/accessibility/details-summary.html 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -22,15 +22,50 @@
</span><span class="cx">
</span><span class="cx"> description("This tests some basic attributes about the details element.");
</span><span class="cx">
</span><ins>+ var callbackCount = 0;
</ins><span class="cx"> if (window.accessibilityController) {
</span><ins>+ window.jsTestIsAsync = true;
</ins><span class="cx">
</span><ins>+ var body = accessibilityController.rootElement.childAtIndex(0);
+ body.addNotificationListener(function(notification) {
+ if (notification == "AXExpandedChanged") {
+ callbackCount++;
+ debug("Received " + notification + " notification ");
+
+ if (callbackCount == 2) {
+ finishJSTest();
+ }
+ }
+ });
+
</ins><span class="cx"> var details1 = accessibilityController.accessibleElementById("details1");
</span><span class="cx"> shouldBe("details1.role", "'AXRole: AXGroup'");
</span><span class="cx"> shouldBe("details1.subrole", "'AXSubrole: AXDetails'");
</span><span class="cx"> shouldBeTrue("details1.isExpanded");
</span><span class="cx"> shouldBe("details1.childAtIndex(0).role", "'AXRole: AXGroup'");
</span><span class="cx"> shouldBe("details1.childAtIndex(0).subrole", "'AXSubrole: AXSummary'");
</span><ins>+ shouldBeTrue("details1.isAttributeSettable('AXExpanded')");
</ins><span class="cx">
</span><ins>+ // Toggle the expanded state.
+ details1.setBoolAttributeValue("AXExpanded", false);
+ details1 = accessibilityController.accessibleElementById("details1");
+ shouldBeFalse("details1.isExpanded");
+
+ // Give it the same value to make sure we don't expand.
+ details1.setBoolAttributeValue("AXExpanded", false);
+ details1 = accessibilityController.accessibleElementById("details1");
+ shouldBeFalse("details1.isExpanded");
+
+ // Set to expand again.
+ details1.setBoolAttributeValue("AXExpanded", true);
+ details1 = accessibilityController.accessibleElementById("details1");
+ shouldBeTrue("details1.isExpanded");
+
+ // And duplicate the true state to make sure it doesn't toggle off.
+ details1.setBoolAttributeValue("AXExpanded", true);
+ details1 = accessibilityController.accessibleElementById("details1");
+ shouldBeTrue("details1.isExpanded");
+
</ins><span class="cx"> var details2 = accessibilityController.accessibleElementById("details2");
</span><span class="cx"> shouldBe("details2.subrole", "'AXSubrole: AXDetails'");
</span><span class="cx"> shouldBeFalse("details2.isExpanded");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-07-02 Chris Fleizach <cfleizach@apple.com>
+
+ AX: <details> element should allow expand/close through AX API
+ https://bugs.webkit.org/show_bug.cgi?id=146549
+
+ Reviewed by Mario Sanchez Prada.
+
+ Allow AXExpanded to be writeable for <details> element, which, when set
+ will toggle the opening and closing of the element.
+ Post a notification when that happens as well.
+
+ Modified test: platform/mac/accessibility/details-summary.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::hierarchicalLevel):
+ (WebCore::AccessibilityNodeObject::setIsExpanded):
+ (WebCore::shouldUseAccessibilityObjectInnerText):
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::supportsPressAction):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::canSetExpandedAttribute):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityIsAttributeSettable:]):
+ (-[WebAccessibilityObjectWrapper _accessibilitySetValue:forAttribute:]):
+ * html/HTMLDetailsElement.cpp:
+ (WebCore::HTMLDetailsElement::toggleOpen):
+
</ins><span class="cx"> 2015-07-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Prevent crashes with plugins.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "HTMLAreaElement.h"
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><ins>+#include "HTMLDetailsElement.h"
</ins><span class="cx"> #include "HTMLFieldSetElement.h"
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLFrameElementBase.h"
</span><span class="lines">@@ -1608,6 +1609,15 @@
</span><span class="cx"> return level;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityNodeObject::setIsExpanded(bool expand)
+{
+ if (is<HTMLDetailsElement>(node())) {
+ HTMLDetailsElement* details = downcast<HTMLDetailsElement>(node());
+ if ((expand && !details->isOpen()) || (!expand && details->isOpen()))
+ details->toggleOpen();
+ }
+}
+
</ins><span class="cx"> // When building the textUnderElement for an object, determine whether or not
</span><span class="cx"> // we should include the inner text of this given descendant object or skip it.
</span><span class="cx"> static bool shouldUseAccessibilityObjectInnerText(AccessibilityObject* obj, AccessibilityTextUnderElementMode mode)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> virtual void colorValue(int& r, int& g, int& b) const override;
</span><span class="cx"> virtual String ariaLabeledByAttribute() const override;
</span><span class="cx"> virtual bool hasAttributesRequiredForInclusion() const override final;
</span><ins>+ virtual void setIsExpanded(bool) override;
</ins><span class="cx">
</span><span class="cx"> virtual Element* actionElement() const override;
</span><span class="cx"> Element* mouseButtonListener(MouseButtonListenerResultFilter = ExcludeBodyElement) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -2041,6 +2041,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (isButton())
</span><span class="cx"> return true;
</span><ins>+ if (roleValue() == DetailsRole)
+ return true;
</ins><span class="cx">
</span><span class="cx"> Element* actionElement = this->actionElement();
</span><span class="cx"> if (!actionElement)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -2800,6 +2800,9 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityRenderObject::canSetExpandedAttribute() const
</span><span class="cx"> {
</span><ins>+ if (roleValue() == DetailsRole)
+ return true;
+
</ins><span class="cx"> // An object can be expanded if it aria-expanded is true or false.
</span><span class="cx"> const AtomicString& ariaExpanded = getAttribute(aria_expandedAttr);
</span><span class="cx"> return equalIgnoringCase(ariaExpanded, "true") || equalIgnoringCase(ariaExpanded, "false");
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (186597 => 186598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-07-09 18:38:39 UTC (rev 186598)
</span><span class="lines">@@ -3096,7 +3096,8 @@
</span><span class="cx"> if ([attributeName isEqualToString: NSAccessibilitySelectedChildrenAttribute])
</span><span class="cx"> return m_object->canSetSelectedChildrenAttribute();
</span><span class="cx">
</span><del>- if ([attributeName isEqualToString:NSAccessibilityDisclosingAttribute])
</del><ins>+ if ([attributeName isEqualToString:NSAccessibilityDisclosingAttribute]
+ || [attributeName isEqualToString:NSAccessibilityExpandedAttribute])
</ins><span class="cx"> return m_object->canSetExpandedAttribute();
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilitySelectedRowsAttribute])
</span><span class="lines">@@ -3423,7 +3424,7 @@
</span><span class="cx"> } else if ([attributeName isEqualToString: NSAccessibilityVisibleCharacterRangeAttribute]) {
</span><span class="cx"> m_object->makeRangeVisible(PlainTextRange(range.location, range.length));
</span><span class="cx"> }
</span><del>- } else if ([attributeName isEqualToString:NSAccessibilityDisclosingAttribute])
</del><ins>+ } else if ([attributeName isEqualToString:NSAccessibilityDisclosingAttribute] || [attributeName isEqualToString:NSAccessibilityExpandedAttribute])
</ins><span class="cx"> m_object->setIsExpanded([number boolValue]);
</span><span class="cx"> else if ([attributeName isEqualToString:NSAccessibilitySelectedRowsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector selectedRows;
</span></span></pre>
</div>
</div>
</body>
</html>