Title: [189994] trunk
- Revision
- 189994
- Author
- n_w...@apple.com
- Date
- 2015-09-18 16:19:46 -0700 (Fri, 18 Sep 2015)
Log Message
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (189993 => 189994)
--- trunk/LayoutTests/ChangeLog 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/LayoutTests/ChangeLog 2015-09-18 23:19:46 UTC (rev 189994)
@@ -1,3 +1,12 @@
+2015-09-18 Nan Wang <n_w...@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:
+
2015-09-18 Jake Nielsen <jacob_niel...@apple.com>
REGRESSION: http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overrides.html is flaky
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (189993 => 189994)
--- 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)
@@ -2831,3 +2831,6 @@
css3/line-break-language-sensitive/line-break-loose-postfixes.html [ ImageOnlyFailure Pass ]
css3/line-break-language-sensitive/line-break-loose-sound-marks.html [ ImageOnlyFailure Pass ]
css3/line-break-language-sensitive/line-break-normal-sound-marks.html [ ImageOnlyFailure Pass ]
+
+# Enable "aria-current" test for iOS
+webkit.org/b/149297 accessibility/aria-current.html [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (189993 => 189994)
--- 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)
@@ -1,3 +1,18 @@
+2015-09-18 Nan Wang <n_w...@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]):
+
2015-09-18 Alex Christensen <achristen...@webkit.org>
Fix Windows tests after switch to CMake.
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (189993 => 189994)
--- 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)
@@ -2411,6 +2411,30 @@
return m_object->invalidStatus();
}
+- (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";
+ }
+}
+
- (WebAccessibilityObjectWrapper *)accessibilityMathRootIndexObject
{
if (![self _prepareAccessibilityCall])
Modified: trunk/Tools/ChangeLog (189993 => 189994)
--- trunk/Tools/ChangeLog 2015-09-18 23:06:47 UTC (rev 189993)
+++ trunk/Tools/ChangeLog 2015-09-18 23:19:46 UTC (rev 189994)
@@ -1,3 +1,17 @@
+2015-09-18 Nan Wang <n_w...@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):
+
2015-09-18 Alexey Proskuryakov <a...@apple.com>
iOS WebKitTestRunner frequently crashes in WKContextGetIconDatabase
Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (189993 => 189994)
--- 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)
@@ -83,6 +83,7 @@
- (void)_accessibilitySetValue:(NSString *)value;
- (void)_accessibilityActivate;
- (UIAccessibilityTraits)_axSelectedTrait;
+- (NSString *)accessibilityARIACurrentStatus;
@end
@interface NSObject (WebAccessibilityObjectWrapperPrivate)
@@ -409,6 +410,9 @@
if (JSStringIsEqualToUTF8CString(attribute, "AXPlaceholderValue"))
return [[m_element accessibilityPlaceholderValue] createJSStringRef];
+ if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
+ return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
+
return JSStringCreateWithCharacters(0, 0);
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (189993 => 189994)
--- 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)
@@ -60,6 +60,7 @@
- (void)_accessibilitySetValue:(NSString *)value;
- (void)_accessibilityActivate;
- (UIAccessibilityTraits)_axSelectedTrait;
+- (NSString *)accessibilityARIACurrentStatus;
@end
@interface NSObject (WebAccessibilityObjectWrapperPrivate)
@@ -314,6 +315,9 @@
if (JSStringIsEqualToUTF8CString(attribute, "AXPlaceholderValue"))
return [[m_element accessibilityPlaceholderValue] createJSStringRef];
+ if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
+ return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
+
return JSStringCreateWithCharacters(0, 0);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
