<!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>[189994] 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/189994">189994</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2015-09-18 16:19:46 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Implement ARIA 1.1 @aria-current on iOS
https://bugs.webkit.org/show_bug.cgi?id=149297
Reviewed by Chris Fleizach.
Source/WebCore:
Added support for iOS to query for aria-current status.
Also, enabled aria-current.html test on iOS.
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityInvalidStatus]):
(-[WebAccessibilityObjectWrapper accessibilityARIACurrentStatus]):
(-[WebAccessibilityObjectWrapper accessibilityMathRootIndexObject]):
Tools:
Added support to test aria-current on iOS.
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::stringAttributeValue):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::stringAttributeValue):
LayoutTests:
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/LayoutTests/ChangeLog 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-18 Nan Wang <n_wang@apple.com>
+
+ AX: Implement ARIA 1.1 @aria-current on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149297
+
+ Reviewed by Chris Fleizach.
+
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2015-09-18 Jake Nielsen <jacob_nielsen@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overrides.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -2831,3 +2831,6 @@
</span><span class="cx"> css3/line-break-language-sensitive/line-break-loose-postfixes.html [ ImageOnlyFailure Pass ]
</span><span class="cx"> css3/line-break-language-sensitive/line-break-loose-sound-marks.html [ ImageOnlyFailure Pass ]
</span><span class="cx"> css3/line-break-language-sensitive/line-break-normal-sound-marks.html [ ImageOnlyFailure Pass ]
</span><ins>+
+# Enable "aria-current" test for iOS
+webkit.org/b/149297 accessibility/aria-current.html [ Pass ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Source/WebCore/ChangeLog 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-18 Nan Wang <n_wang@apple.com>
+
+ AX: Implement ARIA 1.1 @aria-current on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149297
+
+ Reviewed by Chris Fleizach.
+
+ Added support for iOS to query for aria-current status.
+ Also, enabled aria-current.html test on iOS.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityInvalidStatus]):
+ (-[WebAccessibilityObjectWrapper accessibilityARIACurrentStatus]):
+ (-[WebAccessibilityObjectWrapper accessibilityMathRootIndexObject]):
+
</ins><span class="cx"> 2015-09-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows tests after switch to CMake.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -2411,6 +2411,30 @@
</span><span class="cx"> return m_object->invalidStatus();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)accessibilityARIACurrentStatus
+{
+ if (![self _prepareAccessibilityCall])
+ return nil;
+
+ switch (m_object->ariaCurrentState()) {
+ case ARIACurrentFalse:
+ return @"false";
+ case ARIACurrentPage:
+ return @"page";
+ case ARIACurrentStep:
+ return @"step";
+ case ARIACurrentLocation:
+ return @"location";
+ case ARIACurrentTime:
+ return @"time";
+ case ARIACurrentDate:
+ return @"date";
+ default:
+ case ARIACurrentTrue:
+ return @"true";
+ }
+}
+
</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 (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Tools/ChangeLog 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-18 Nan Wang <n_wang@apple.com>
+
+ AX: Implement ARIA 1.1 @aria-current on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149297
+
+ Reviewed by Chris Fleizach.
+
+ Added support to test aria-current on iOS.
+
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::stringAttributeValue):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
</ins><span class="cx"> 2015-09-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS WebKitTestRunner frequently crashes in WKContextGetIconDatabase
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> - (void)_accessibilitySetValue:(NSString *)value;
</span><span class="cx"> - (void)_accessibilityActivate;
</span><span class="cx"> - (UIAccessibilityTraits)_axSelectedTrait;
</span><ins>+- (NSString *)accessibilityARIACurrentStatus;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -409,6 +410,9 @@
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXPlaceholderValue"))
</span><span class="cx"> return [[m_element accessibilityPlaceholderValue] createJSStringRef];
</span><span class="cx">
</span><ins>+ if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
+ return [[m_element accessibilityARIACurrentStatus] 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 (189993 => 189994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2015-09-18 23:19:46 UTC (rev 189994)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> - (void)_accessibilitySetValue:(NSString *)value;
</span><span class="cx"> - (void)_accessibilityActivate;
</span><span class="cx"> - (UIAccessibilityTraits)_axSelectedTrait;
</span><ins>+- (NSString *)accessibilityARIACurrentStatus;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperPrivate)
</span><span class="lines">@@ -314,6 +315,9 @@
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXPlaceholderValue"))
</span><span class="cx"> return [[m_element accessibilityPlaceholderValue] createJSStringRef];
</span><span class="cx">
</span><ins>+ if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
+ return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
+
</ins><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>