Changeset 271416 in webkit

Timestamp:

Jan 12, 2021 2:13:28 PM (3 years ago)

Author:

Chris Fleizach

Message:

AX: Implement aria-braillelabel and aria-brailleroledescription
​https://bugs.webkit.org/show_bug.cgi?id=220516
<rdar://problem/73004715>

Reviewed by Zalan Bujtas.

Source/WebCore:

Add support for new ARIA attributes.

Test: accessibility/mac/braille-label-role.html

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityObjectInterface.h:
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper accessibilityBrailleLabel]):
(-[WebAccessibilityObjectWrapper accessibilityBrailleRoleDescription]):

• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::initializeAttributeData):

• accessibility/isolatedtree/AXIsolatedObject.h:
• accessibility/isolatedtree/AXIsolatedTree.h:
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

• html/HTMLAttributeNames.in:

LayoutTests:

• accessibility/braille-label-role-expected.txt: Added.
• accessibility/braille-label-role.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/braille-label-role-expected.txt (added)
• LayoutTests/accessibility/braille-label-role.html (added)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObjectInterface.h (modified) (1 diff)
• Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)
• Source/WebCore/html/HTMLAttributeNames.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-12  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Implement aria-braillelabel and aria-brailleroledescription
+        https://bugs.webkit.org/show_bug.cgi?id=220516
+        <rdar://problem/73004715>
+
+        Reviewed by Zalan Bujtas.
+
+        * accessibility/braille-label-role-expected.txt: Added.
+        * accessibility/braille-label-role.html: Added.
+
 2021-01-12  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -137 +137 @@
 webkit.org/b/215405 accessibility/gtk/text-for-range-combo-box.html [ Failure ]
 webkit.org/b/215405 inspector/dom/getAccessibilityPropertiesForNode.html [ Failure ]
+# aria-braille* attributes are not implemented:
+accessibility/braille-label-role.html
 
 # CSS

trunk/LayoutTests/platform/win/TestExpectations

@@ -1560 +1560 @@
 # Color Well is not implemented:
 accessibility/color-well.html
+
+# aria-braille* attributes are not implemented:
+accessibility/braille-label-role.html
 
 # Failing Windows-only accessibility tests

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-12  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Implement aria-braillelabel and aria-brailleroledescription
+        https://bugs.webkit.org/show_bug.cgi?id=220516
+        <rdar://problem/73004715>
+
+        Reviewed by Zalan Bujtas.
+
+        Add support for new ARIA attributes.
+
+        Test: accessibility/mac/braille-label-role.html
+
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityBrailleLabel]):
+        (-[WebAccessibilityObjectWrapper accessibilityBrailleRoleDescription]):
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::initializeAttributeData):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+        * accessibility/isolatedtree/AXIsolatedTree.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+        * html/HTMLAttributeNames.in:
+
 2021-01-12  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -398 +398 @@
     const String placeholderValue() const override;
     bool accessibleNameDerivesFromContent() const override;
+    String brailleLabel() const override { return getAttribute(HTMLNames::aria_braillelabelAttr); }
+    String brailleRoleDescription() const override { return getAttribute(HTMLNames::aria_brailleroledescriptionAttr); }
 
     // Abbreviations

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -1010 +1010 @@
     virtual int layoutCount() const = 0;
     virtual double estimatedLoadingProgress() const = 0;
+    virtual String brailleLabel() const = 0;
+    virtual String brailleRoleDescription() const = 0;
 
     virtual bool supportsARIAOwns() const = 0;

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -1160 +1160 @@
 }
 
+- (NSString *)accessibilityBrailleLabel
+{
+    if (![self _prepareAccessibilityCall])
+        return nil;
+    return self.axBackingObject->brailleLabel();
+}
+
+- (NSString *)accessibilityBrailleRoleDescription
+{
+    if (![self _prepareAccessibilityCall])
+        return nil;
+    return self.axBackingObject->brailleRoleDescription();
+}
+
 - (NSString *)accessibilityLabel
 {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -236 +236 @@
     setObjectProperty(AXPropertyName::PreviousSibling, object.previousSibling());
     setProperty(AXPropertyName::SupportsCheckedState, object.supportsCheckedState());
+    setProperty(AXPropertyName::BrailleRoleDescription, object.brailleRoleDescription().isolatedCopy());
+    setProperty(AXPropertyName::BrailleLabel, object.brailleLabel().isolatedCopy());
 
     if (object.isTable()) {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -271 +271 @@
     IntPoint clickPoint() override { return intPointAttributeValue(AXPropertyName::ClickPoint); }
     void accessibilityText(Vector<AccessibilityText>& texts) const override;
+    String brailleLabel() const override { return stringAttributeValue(AXPropertyName::BrailleLabel); }
+    String brailleRoleDescription() const override { return stringAttributeValue(AXPropertyName::BrailleRoleDescription); }
+
     String computedRoleString() const override { return stringAttributeValue(AXPropertyName::ComputedRoleString); }
     bool isValueAutofilled() const override { return boolAttributeValue(AXPropertyName::IsValueAutofilled); }

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h

@@ -70 +70 @@
     BlockquoteLevel,
     BoundingBoxRect,
+    BrailleLabel,
+    BrailleRoleDescription,
     CanHaveSelectedChildren,
     CanSetExpandedAttribute,

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -534 +534 @@
 #ifndef NSAccessibilityRelativeFrameAttribute
 #define NSAccessibilityRelativeFrameAttribute @"AXRelativeFrame"
+#endif
+
+#ifndef NSAccessibilityBrailleLabelAttribute
+#define NSAccessibilityBrailleLabelAttribute @"AXBrailleLabel"
+#endif
+
+#ifndef NSAccessibilityBrailleRoleDescriptionAttribute
+#define NSAccessibilityBrailleRoleDescriptionAttribute @"AXBrailleRoleDescription"
 #endif
 
@@ -2903 +2911 @@
     }
 
+    if ([attributeName isEqualToString:NSAccessibilityBrailleLabelAttribute])
+        return backingObject->brailleLabel();
+
+    if ([attributeName isEqualToString:NSAccessibilityBrailleRoleDescriptionAttribute])
+        return backingObject->brailleRoleDescription();
+
     if ([attributeName isEqualToString:NSAccessibilityRelativeFrameAttribute])
         return [NSValue valueWithRect:(NSRect)backingObject->relativeFrame()];

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -18 +18 @@
 aria-atomic
 aria-autocomplete
+aria-braillelabel
+aria-brailleroledescription
 aria-busy
 aria-checked