<!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>[208197] 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/208197">208197</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 17:03:52 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: aria-sort is not exposed on iOS
https://bugs.webkit.org/show_bug.cgi?id=164245
Reviewed by Chris Fleizach.
Source/WebCore:
Exposed the aria-sort attribute value in accessibilitySortDirection.
Test: accessibility/ios-simulator/aria-sort-ios.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilitySortDirection]):
Tools:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::stringAttributeValue):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::stringAttributeValue):
LayoutTests:
* accessibility/ios-simulator/aria-sort-ios-expected.txt: Added.
* accessibility/ios-simulator/aria-sort-ios.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="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorariasortiosexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorariasortioshtml">trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/LayoutTests/ChangeLog 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-31 Nan Wang <n_wang@apple.com>
+
+ AX: aria-sort is not exposed on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=164245
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ios-simulator/aria-sort-ios-expected.txt: Added.
+ * accessibility/ios-simulator/aria-sort-ios.html: Added.
+
</ins><span class="cx"> 2016-10-31 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r208178.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorariasortiosexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios-expected.txt (0 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios-expected.txt 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+column column column
+row
+This tests that aria-sort is exposed correctly to the iOS accessibility API.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS col1.stringAttributeValue('AXSortDirection') is 'ascending'
+PASS col2.stringAttributeValue('AXSortDirection') is 'descending'
+PASS col3.stringAttributeValue('AXSortDirection') is 'other'
+PASS row1.stringAttributeValue('AXSortDirection') is null
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorariasortioshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios.html (0 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/aria-sort-ios.html 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<div role="grid">
+<div role="row">
+<span role="gridcell"></span>
+<!-- Ascending aria-sort direction. -->
+<span aria-sort="ascending" aria-label="label" id="col1" role="columnheader">column</span>
+<!-- Descending aria-sort direction. -->
+<span aria-sort="descending" id="col2" role="columnheader">column</span>
+<!-- Other aria-sort direction. -->
+<span aria-sort="other" id="col3" role="columnheader">column</span>
+</div>
+<div role="row">
+<!-- No aria-sort direction. -->
+<span id="row1" role="rowheader">row</span>
+<span role="gridcell"></span>
+</div>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+ description("This tests that aria-sort is exposed correctly to the iOS accessibility API.");
+
+ if (window.accessibilityController) {
+ var col1 = accessibilityController.accessibleElementById("col1");
+ shouldBe("col1.stringAttributeValue('AXSortDirection')", "'ascending'");
+
+ var col2 = accessibilityController.accessibleElementById("col2");
+ shouldBe("col2.stringAttributeValue('AXSortDirection')", "'descending'");
+
+ var col3 = accessibilityController.accessibleElementById("col3");
+ shouldBe("col3.stringAttributeValue('AXSortDirection')", "'other'");
+
+ var row1 = accessibilityController.accessibleElementById("row1");
+ shouldBe("row1.stringAttributeValue('AXSortDirection')", "null");
+ }
+</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 (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/Source/WebCore/ChangeLog 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-31 Nan Wang <n_wang@apple.com>
+
+ AX: aria-sort is not exposed on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=164245
+
+ Reviewed by Chris Fleizach.
+
+ Exposed the aria-sort attribute value in accessibilitySortDirection.
+
+ Test: accessibility/ios-simulator/aria-sort-ios.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilitySortDirection]):
+
</ins><span class="cx"> 2016-10-31 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r208178.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -2758,6 +2758,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)accessibilitySortDirection
+{
+ if (![self _prepareAccessibilityCall])
+ return nil;
+
+ switch (m_object->sortDirection()) {
+ case SortDirectionAscending:
+ return @"ascending";
+ case SortDirectionDescending:
+ return @"descending";
+ case SortDirectionOther:
+ return @"other";
+ default:
+ case SortDirectionNone:
+ return nil;
+ }
+}
+
</ins><span class="cx"> - (WebAccessibilityObjectWrapper *)accessibilityMathRootIndexObject
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/Tools/ChangeLog 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-31 Nan Wang <n_wang@apple.com>
+
+ AX: aria-sort is not exposed on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=164245
+
+ Reviewed by Chris Fleizach.
+
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::stringAttributeValue):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
</ins><span class="cx"> 2016-10-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement IntersectionObserver
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> - (id)_accessibilityFieldsetAncestor;
</span><span class="cx"> - (BOOL)_accessibilityHasTouchEventListener;
</span><span class="cx"> - (NSString *)accessibilityExpandedTextValue;
</span><ins>+- (NSString *)accessibilitySortDirection;
</ins><span class="cx"> - (BOOL)accessibilityIsExpanded;
</span><span class="cx">
</span><span class="cx"> // TextMarker related
</span><span class="lines">@@ -660,6 +661,9 @@
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
</span><span class="cx"> return [[m_element accessibilityExpandedTextValue] createJSStringRef];
</span><span class="cx">
</span><ins>+ if (JSStringIsEqualToUTF8CString(attribute, "AXSortDirection"))
+ return [[m_element accessibilitySortDirection] createJSStringRef];
+
</ins><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (208196 => 208197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-10-31 23:57:05 UTC (rev 208196)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2016-11-01 00:03:52 UTC (rev 208197)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> - (id)_accessibilityFieldsetAncestor;
</span><span class="cx"> - (BOOL)_accessibilityHasTouchEventListener;
</span><span class="cx"> - (NSString *)accessibilityExpandedTextValue;
</span><ins>+- (NSString *)accessibilitySortDirection;
</ins><span class="cx"> - (BOOL)accessibilityIsExpanded;
</span><span class="cx">
</span><span class="cx"> // TextMarker related
</span><span class="lines">@@ -346,6 +347,9 @@
</span><span class="cx">
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
</span><span class="cx"> return [[m_element accessibilityExpandedTextValue] createJSStringRef];
</span><ins>+
+ if (JSStringIsEqualToUTF8CString(attribute, "AXSortDirection"))
+ return [[m_element accessibilitySortDirection] createJSStringRef];
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>