Changeset 293345 in webkit

Timestamp:

Apr 25, 2022 1:49:06 PM (3 months ago)

Author:

Chris Fleizach

Message:

AX: Don't expose aria-roledescription value on "generic" elements (e.g. div and span) unless explicit role value is also defined
​https://bugs.webkit.org/show_bug.cgi?id=174248
<rdar://problem/33178050>

Reviewed by Andres Gonzalez.

Source/WebCore:

ARIA spec states to not expose the role description on "generic" elements.
​https://www.w3.org/TR/wai-aria/#aria-roledescription

Test: accessibility/ignored-aria-role-description.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::supportsARIARoleDescription const):
(WebCore::AccessibilityObject::roleDescription const):

• accessibility/AccessibilityObject.h:

LayoutTests:

• accessibility/ignored-aria-role-description-expected.txt: Added.
• accessibility/ignored-aria-role-description.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/ignored-aria-role-description-expected.txt (added)
• LayoutTests/accessibility/ignored-aria-role-description.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.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-25  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Don't expose aria-roledescription value on "generic" elements (e.g. div and span) unless explicit role value is also defined
+        https://bugs.webkit.org/show_bug.cgi?id=174248
+        <rdar://problem/33178050>
+
+        Reviewed by Andres Gonzalez.
+
+        * accessibility/ignored-aria-role-description-expected.txt: Added.
+        * accessibility/ignored-aria-role-description.html: Added.
+
 2022-04-25  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1860 +1860 @@
 
 accessibility/dialog-properties.html [ Skip ]
+accessibility/ignored-aria-role-description.html [ Skip ]
 
 # These tests require platform support.

trunk/LayoutTests/platform/win/TestExpectations

@@ -464 +464 @@
 # Probably wrong role after adding children to list (AXGroup instead of AXList).
 accessibility/list-with-dynamically-changing-content.html [ Skip ]
+accessibility/ignored-aria-role-description.html [ Skip ]
 
 # Need to implement AccessibilityUIElement::clearSelectedChildren()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-25  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Don't expose aria-roledescription value on "generic" elements (e.g. div and span) unless explicit role value is also defined
+        https://bugs.webkit.org/show_bug.cgi?id=174248
+        <rdar://problem/33178050>
+
+        Reviewed by Andres Gonzalez.
+
+        ARIA spec states to not expose the role description on "generic" elements.
+        https://www.w3.org/TR/wai-aria/#aria-roledescription
+
+        Test: accessibility/ignored-aria-role-description.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::supportsARIARoleDescription const):
+        (WebCore::AccessibilityObject::roleDescription const):
+        * accessibility/AccessibilityObject.h:
+
 2022-04-25  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -2705 +2705 @@
 }
 
+// ARIA spec: User agents must not expose the aria-roledescription property if the element to which aria-roledescription is applied does not have a valid WAI-ARIA role or does not have an implicit WAI-ARIA role semantic.
+bool AccessibilityObject::supportsARIARoleDescription() const
+{
+    auto role = this->roleValue();
+    switch (role) {
+    case AccessibilityRole::Div:
+    case AccessibilityRole::Unknown:
+        return false;
+    default:
+        return true;
+    }
+}
+
 String AccessibilityObject::roleDescription() const
 {
     // aria-roledescription takes precedence over any other rule.
-    String roleDescription = stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_roledescriptionAttr));
-    if (!roleDescription.isEmpty())
-        return roleDescription;
-
-    roleDescription = rolePlatformDescription();
+    if (supportsARIARoleDescription()) {
+        auto roleDescription = stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_roledescriptionAttr));
+        if (!roleDescription.isEmpty())
+            return roleDescription;
+    }
+
+    auto roleDescription = rolePlatformDescription();
     if (!roleDescription.isEmpty())
         return roleDescription;

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -299 +299 @@
     bool supportsCheckedState() const override;
 
+    bool supportsARIARoleDescription() const;
     bool supportsARIAOwns() const override { return false; }
     bool isActiveDescendantOfFocusedContainer() const override;