<!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>[188947] 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/188947">188947</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-25 23:49:45 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Enable accessibility/aria-controls.html test for mac
https://bugs.webkit.org/show_bug.cgi?id=148458
Patch by Nan Wang <n_wang@apple.com> on 2015-08-25
Reviewed by Chris Fleizach.
Source/WebCore:
Re-enabled accessibility/aria-controls.html test for mac.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
Tools:
Implemented ariaControlsElementAtIndex(unsigned index).
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::ariaControlsElementAtIndex):
(AccessibilityUIElement::disclosedRowAtIndex):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::ariaControlsElementAtIndex):
LayoutTests:
* accessibility/aria-controls.html:
* platform/mac/TestExpectations:
* platform/mac/accessibility/aria-controls-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariacontrolshtml">trunk/LayoutTests/accessibility/aria-controls.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</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="#trunkLayoutTestsplatformmacaccessibilityariacontrolsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-25 Nan Wang <n_wang@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/aria-controls.html:
+ * platform/mac/TestExpectations:
+ * platform/mac/accessibility/aria-controls-expected.txt: Added.
+
</ins><span class="cx"> 2015-08-25 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> More test gardening of css3/line-break-language-sensitive.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariacontrolshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-controls.html (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-controls.html 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/accessibility/aria-controls.html 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -22,8 +22,13 @@
</span><span class="cx"> var tablist = accessibilityController.accessibleElementById("tablist");
</span><span class="cx"> var tab1 = tablist.childAtIndex(0);
</span><span class="cx">
</span><del>- shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
- shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
</del><ins>+ if (accessibilityController.platformName == "mac") {
+ shouldBe("tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue", "'AXValue: Panel 1'");
+ shouldBe("tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue", "'AXValue: Panel 2'");
+ } else {
+ shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
+ shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -47,9 +47,6 @@
</span><span class="cx"> # Missing implementation of some functions in mac.
</span><span class="cx"> webkit.org/b/129039 accessibility/select-element-at-index.html [ Skip ]
</span><span class="cx">
</span><del>-# ariaControlsElementAtIndex is not implemented in mac
-webkit.org/b/127908 accessibility/aria-controls.html [ Skip ]
-
</del><span class="cx"> # Need to add functionality to DumpRenderTree to handle error pages
</span><span class="cx"> fast/history/back-forward-reset-after-error-handling.html
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariacontrolsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt (0 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Panel 1
+Panel 2
+This tests that aria-controls returns correct element at the given index
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue is 'AXValue: Panel 1'
+PASS tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue is 'AXValue: Panel 2'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Source/WebCore/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-25 Nan Wang <n_wang@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ Re-enabled accessibility/aria-controls.html test for mac.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
</ins><span class="cx"> 2015-08-25 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Using the filter functional notation for background images results in wrong background-size rendering
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -241,6 +241,10 @@
</span><span class="cx"> #define NSAccessibilityDocumentEncodingAttribute @"AXDocumentEncoding"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilityAriaControlsAttribute
+#define NSAccessibilityAriaControlsAttribute @"AXARIAControls"
+#endif
+
</ins><span class="cx"> #define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
</span><span class="cx"> #define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
</span><span class="cx">
</span><span class="lines">@@ -3068,6 +3072,13 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Aria controls element
+ if ([attributeName isEqualToString:NSAccessibilityAriaControlsAttribute]) {
+ AccessibilityObject::AccessibilityChildrenVector ariaControls;
+ m_object->ariaControlsElements(ariaControls);
+ return convertToNSArray(ariaControls);
+ }
+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-25 Nan Wang <n_wang@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ Implemented ariaControlsElementAtIndex(unsigned index).
+
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::ariaControlsElementAtIndex):
+ (AccessibilityUIElement::disclosedRowAtIndex):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::ariaControlsElementAtIndex):
+
</ins><span class="cx"> 2015-08-25 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove python tests for PassRefPtr
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -395,8 +395,13 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityUIElement AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
</span><span class="cx"> {
</span><del>- // FIXME: implement
- return 0;
</del><ins>+ BEGIN_AX_OBJC_EXCEPTIONS
+ NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
+ if (index < [ariaControls count])
+ return [ariaControls objectAtIndex:index];
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityUIElement AccessibilityUIElement::disclosedRowAtIndex(unsigned index)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (188946 => 188947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
</span><span class="lines">@@ -458,7 +458,11 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
</span><span class="cx"> {
</span><del>- // FIXME: implement
</del><ins>+ BEGIN_AX_OBJC_EXCEPTIONS
+ NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
+ if (index < [ariaControls count])
+ return AccessibilityUIElement::create([ariaControls objectAtIndex:index]);
+ END_AX_OBJC_EXCEPTIONS
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>