AX: add a new trait for elements in fieldset on iOS

https://bugs.webkit.org/show_bug.cgi?id=151281 Reviewed by Chris Fleizach. Source/WebCore: Added a new trait for elements in the fieldset, so VoiceOver can speak the legend information for those elements. Test: accessibility/ios-simulator/fieldset-traits.html * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]): (-[WebAccessibilityObjectWrapper _accessibilityTableAncestor]): (-[WebAccessibilityObjectWrapper _accessibilityFieldsetAncestor]): (-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]): Tools: * DumpRenderTree/AccessibilityUIElement.cpp: (assistiveTechnologySimulatedFocusCallback): (fieldsetAncestorElementCallback): (childAtIndexCallback): (getElementTextLengthCallback): (hasContainedByFieldsetTraitCallback): (AccessibilityUIElement::getJSClass): * DumpRenderTree/AccessibilityUIElement.h: * DumpRenderTree/ios/AccessibilityUIElementIOS.mm: (AccessibilityUIElement::elementTextLength): (AccessibilityUIElement::hasContainedByFieldsetTrait): (AccessibilityUIElement::fieldsetAncestorElement): (AccessibilityUIElement::url): * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp: (WTR::AccessibilityUIElement::scrollPageDown): (WTR::AccessibilityUIElement::scrollPageLeft): (WTR::AccessibilityUIElement::scrollPageRight): (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait): (WTR::AccessibilityUIElement::fieldsetAncestorElement): * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h: * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl: * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm: (WTR::AccessibilityUIElement::identifier): (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait): (WTR::AccessibilityUIElement::fieldsetAncestorElement): (WTR::AccessibilityUIElement::rowCount): LayoutTests: * accessibility/ios-simulator/fieldset-traits-expected.txt: Added. * accessibility/ios-simulator/fieldset-traits.html: Added. Canonical link: https://commits.webkit.org/169454@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 14, 2015 · 9a8c226 · 9a8c226
1 parent 23f1dd8
commit 9a8c226
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 1 deletion.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2015-11-14  Nan Wang  <n_wang@apple.com>
+
+        AX: add a new trait for elements in fieldset on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=151281
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/ios-simulator/fieldset-traits-expected.txt: Added.
+        * accessibility/ios-simulator/fieldset-traits.html: Added.
+
 2015-11-13  Zalan Bujtas  <zalan@apple.com>
 
         Always render at least a device pixel line when border/outline width > 0.

diff --git a/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt b/LayoutTests/accessibility/ios-simulator/fieldset-traits-expected.txt
@@ -0,0 +1,14 @@
+Personalia:
+Name: 
+Email: 
+This tests that elements in a fieldset are having the correct traits.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS inputname.hasContainedByFieldsetTrait is true
+PASS fieldset.isEqual(inputname.fieldsetAncestorElement()) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/accessibility/ios-simulator/fieldset-traits.html b/LayoutTests/accessibility/ios-simulator/fieldset-traits.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<form>
+<fieldset id="fieldset">
+<legend>Personalia:</legend>
+Name: <input type="text" id="inputname"><br>
+Email: <input type="text"><br>
+</fieldset>
+</form>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+    description("This tests that elements in a fieldset are having the correct traits.");
+
+    if (window.accessibilityController) {
+
+        var inputname = accessibilityController.accessibleElementById("inputname");
+        var fieldset = accessibilityController.accessibleElementById("fieldset");
+        shouldBeTrue("inputname.hasContainedByFieldsetTrait");
+        shouldBeTrue("fieldset.isEqual(inputname.fieldsetAncestorElement())");
+    }
+
+    successfullyParsed = true;
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
+
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2015-11-14  Nan Wang  <n_wang@apple.com>
+
+        AX: add a new trait for elements in fieldset on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=151281
+
+        Reviewed by Chris Fleizach.
+
+        Added a new trait for elements in the fieldset, so VoiceOver can speak the legend
+        information for those elements.
+
+        Test: accessibility/ios-simulator/fieldset-traits.html
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+        (-[WebAccessibilityObjectWrapper _accessibilityTableAncestor]):
+        (-[WebAccessibilityObjectWrapper _accessibilityFieldsetAncestor]):
+        (-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
+
 2015-11-13  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r192445, r192451, and r192452.

diff --git a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
@@ -271,6 +271,7 @@ - (uint64_t)_axMenuItemTrait { return (1 << 18); }
 - (uint64_t)_axSelectedTrait { return (1 << 19); }
 - (uint64_t)_axNotEnabledTrait { return (1 << 20); }
 - (uint64_t)_axRadioButtonTrait { return (1 << 21); }
+- (uint64_t)_axContainedByFieldsetTrait { return (1 << 22); }
 
 - (BOOL)accessibilityCanFuzzyHitTest
 {
@@ -494,6 +495,16 @@ - (AccessibilityObjectWrapper*)_accessibilityTableAncestor
     return nil;
 }
 
+- (AccessibilityObjectWrapper*)_accessibilityFieldsetAncestor
+{
+    for (AccessibilityObject* parent = m_object->parentObject(); parent != nil; parent = parent->parentObject()) {
+        if (parent->isFieldset())
+            return parent->wrapper();
+    }
+
+    return nil;
+}
+
 - (uint64_t)_accessibilityTraitsFromAncestors
 {
     uint64_t traits = 0;
@@ -538,6 +549,10 @@ - (uint64_t)_accessibilityTraitsFromAncestors
                     traits |= [self _axContainedByLandmarkTrait];
                 break;
         }
+
+        // If this object has fieldset parent, we should add containedByFieldsetTrait to it.
+        if (parent->isFieldset())
+            traits |= [self _axContainedByFieldsetTrait];
     }
 
     return traits;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,37 @@
+2015-11-14  Nan Wang  <n_wang@apple.com>
+
+        AX: add a new trait for elements in fieldset on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=151281
+
+        Reviewed by Chris Fleizach.
+
+        * DumpRenderTree/AccessibilityUIElement.cpp:
+        (assistiveTechnologySimulatedFocusCallback):
+        (fieldsetAncestorElementCallback):
+        (childAtIndexCallback):
+        (getElementTextLengthCallback):
+        (hasContainedByFieldsetTraitCallback):
+        (AccessibilityUIElement::getJSClass):
+        * DumpRenderTree/AccessibilityUIElement.h:
+        * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+        (AccessibilityUIElement::elementTextLength):
+        (AccessibilityUIElement::hasContainedByFieldsetTrait):
+        (AccessibilityUIElement::fieldsetAncestorElement):
+        (AccessibilityUIElement::url):
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+        (WTR::AccessibilityUIElement::scrollPageDown):
+        (WTR::AccessibilityUIElement::scrollPageLeft):
+        (WTR::AccessibilityUIElement::scrollPageRight):
+        (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
+        (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+        (WTR::AccessibilityUIElement::identifier):
+        (WTR::AccessibilityUIElement::hasContainedByFieldsetTrait):
+        (WTR::AccessibilityUIElement::fieldsetAncestorElement):
+        (WTR::AccessibilityUIElement::rowCount):
+
 2015-11-13  Keith Miller  <keith_miller@apple.com>
 
         Unreviewed, change JavaScriptCore watchlist to exclude inspector things.

diff --git a/Tools/DumpRenderTree/AccessibilityUIElement.cpp b/Tools/DumpRenderTree/AccessibilityUIElement.cpp
@@ -364,6 +364,11 @@ static JSValueRef assistiveTechnologySimulatedFocusCallback(JSContextRef context
     return JSValueMakeUndefined(context);
 }
 
+static JSValueRef fieldsetAncestorElementCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    return AccessibilityUIElement::makeJSAccessibilityUIElement(context, toAXElement(thisObject)->fieldsetAncestorElement());
+}
+
 #endif
 
 static JSValueRef childAtIndexCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
@@ -1373,7 +1378,10 @@ static JSValueRef getElementTextLengthCallback(JSContextRef context, JSObjectRef
     return JSValueMakeNumber(context, toAXElement(thisObject)->elementTextLength());
 }
 
-
+static JSValueRef hasContainedByFieldsetTraitCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+    return JSValueMakeBoolean(context, toAXElement(thisObject)->hasContainedByFieldsetTrait());
+}
 
 #endif // PLATFORM(IOS)
 
@@ -1631,6 +1639,7 @@ JSClassRef AccessibilityUIElement::getJSClass()
         { "elementTextPosition", getElementTextPositionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "elementTextLength", getElementTextLengthCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "stringForSelection", stringForSelectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+        { "hasContainedByFieldsetTrait", hasContainedByFieldsetTraitCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
 #endif // PLATFORM(IOS)
 #if PLATFORM(MAC) && !PLATFORM(IOS)
         { "supportedActions", supportedActionsCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
@@ -1748,6 +1757,7 @@ JSClassRef AccessibilityUIElement::getJSClass()
         { "scrollPageLeft", scrollPageLeftCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "scrollPageRight", scrollPageRightCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "assistiveTechnologySimulatedFocus", assistiveTechnologySimulatedFocusCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+        { "fieldsetAncestorElement", fieldsetAncestorElementCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
 #endif
         { 0, 0, 0 }
     };

diff --git a/Tools/DumpRenderTree/AccessibilityUIElement.h b/Tools/DumpRenderTree/AccessibilityUIElement.h
@@ -226,6 +226,9 @@ class AccessibilityUIElement {
     bool scrollPageDown();
     bool scrollPageLeft();
     bool scrollPageRight();
+
+    bool hasContainedByFieldsetTrait();
+    AccessibilityUIElement fieldsetAncestorElement();
 #endif
 
 #if PLATFORM(GTK) || PLATFORM(EFL)

diff --git a/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm b/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm
@@ -90,6 +90,8 @@ - (NSUInteger)accessibilityARIARowCount;
 - (NSUInteger)accessibilityARIAColumnCount;
 - (NSUInteger)accessibilityARIARowIndex;
 - (NSUInteger)accessibilityARIAColumnIndex;
+- (UIAccessibilityTraits)_axContainedByFieldsetTrait;
+- (id)_accessibilityFieldsetAncestor;
 @end
 
 @interface NSObject (WebAccessibilityObjectWrapperPrivate)
@@ -134,6 +136,22 @@ static JSStringRef concatenateAttributeAndValue(NSString* attribute, NSString* v
     return range.length;    
 }
 
+bool AccessibilityUIElement::hasContainedByFieldsetTrait()
+{
+    UIAccessibilityTraits traits = [m_element accessibilityTraits];
+    return (traits & [m_element _axContainedByFieldsetTrait]) == [m_element _axContainedByFieldsetTrait];
+}
+
+AccessibilityUIElement AccessibilityUIElement::fieldsetAncestorElement()
+{
+    id ancestorElement = [m_element _accessibilityFieldsetAncestor];
+    if (ancestorElement)
+        return AccessibilityUIElement(ancestorElement);
+
+    return nullptr;
+}
+
+
 JSStringRef AccessibilityUIElement::url()
 {
     NSURL *url = [m_element accessibilityURL];

diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
@@ -70,6 +70,8 @@ bool AccessibilityUIElement::scrollPageUp() { return false; }
 bool AccessibilityUIElement::scrollPageDown() { return false; }
 bool AccessibilityUIElement::scrollPageLeft() { return false; }
 bool AccessibilityUIElement::scrollPageRight() { return false; }
+bool AccessibilityUIElement::hasContainedByFieldsetTrait() { return false; }
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement() { return nullptr; }
 #endif
 
 // Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.

diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
@@ -282,6 +282,10 @@ class AccessibilityUIElement : public JSWrappable {
     bool scrollPageLeft();
     bool scrollPageRight();
 
+    // Fieldset
+    bool hasContainedByFieldsetTrait();
+    PassRefPtr<AccessibilityUIElement> fieldsetAncestorElement();
+
 private:
     AccessibilityUIElement(PlatformUIElement);
     AccessibilityUIElement(const AccessibilityUIElement&);

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
@@ -223,6 +223,10 @@ interface AccessibilityUIElement {
     // This will simulate the accessibilityDidBecomeFocused API in UIKit.
     void assistiveTechnologySimulatedFocus();
 
+    // Fieldset
+    readonly attribute boolean hasContainedByFieldsetTrait;
+    AccessibilityUIElement fieldsetAncestorElement();
+
     // Notification support.
     boolean addNotificationListener(object callbackFunction);
     boolean removeNotificationListener();

diff --git a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
@@ -67,6 +67,8 @@ - (NSUInteger)accessibilityARIARowCount;
 - (NSUInteger)accessibilityARIAColumnCount;
 - (NSUInteger)accessibilityARIARowIndex;
 - (NSUInteger)accessibilityARIAColumnIndex;
+- (UIAccessibilityTraits)_axContainedByFieldsetTrait;
+- (id)_accessibilityFieldsetAncestor;
 @end
 
 @interface NSObject (WebAccessibilityObjectWrapperPrivate)
@@ -672,6 +674,21 @@ static JSValueRef convertElementsToObjectArray(JSContextRef context, Vector<RefP
     return concatenateAttributeAndValue(@"AXIdentifier", [m_element accessibilityIdentifier]);
 }
 
+bool AccessibilityUIElement::hasContainedByFieldsetTrait()
+{
+    UIAccessibilityTraits traits = [m_element accessibilityTraits];
+    return (traits & [m_element _axContainedByFieldsetTrait]) == [m_element _axContainedByFieldsetTrait];
+}
+
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement()
+{
+    id ancestorElement = [m_element _accessibilityFieldsetAncestor];
+    if (ancestorElement)
+        return AccessibilityUIElement::create(ancestorElement);
+
+    return nullptr;
+}
+
 int AccessibilityUIElement::rowCount()
 {
     return [m_element accessibilityRowCount];