Changeset 289713 in webkit

Timestamp:

Feb 13, 2022 8:00:33 AM (5 months ago)

Author:

Andres Gonzalez

Message:

Expose the correct role, subrole and role description properties for the <dialog> element.
​https://bugs.webkit.org/show_bug.cgi?id=236359

Reviewed by Chris Fleizach.

Source/WebCore:

Test: accessibility/dialog-properties.html

Elements with role="dialog" are exposed to accessibility clients with
role AXGroup, subrole AXApplicationDialog and role description
"web dialog". This patch implements this behavior for the <dialog>
element.

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::determineAccessibilityRoleFromNode const):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::defaultObjectInclusion const):

LayoutTests:

Tests that these AX properties have the expected values both when the
dialog is shown modal or modeless.

• accessibility/dialog-properties-expected.txt: Added.
• accessibility/dialog-properties.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/dialog-properties-expected.txt (added)
• LayoutTests/accessibility/dialog-properties.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/AccessibilityNodeObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-13  Andres Gonzalez  <andresg_22@apple.com>
+
+        Expose the correct role, subrole and role description properties for the <dialog> element.
+        https://bugs.webkit.org/show_bug.cgi?id=236359
+
+        Reviewed by Chris Fleizach.
+
+        Tests that these AX properties have the expected values both when the
+        dialog is shown modal or modeless.
+
+        * accessibility/dialog-properties-expected.txt: Added.
+        * accessibility/dialog-properties.html: Added.
+
 2022-02-12  Tim Nguyen  <ntim@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1850 +1850 @@
 #////////////////////////////////////////////////////////////////////////////////////////
 
+accessibility/dialog-properties.html [ Skip ]
+
 # These tests require platform support.
 media/media-allowed-codecs.html

trunk/LayoutTests/platform/win/TestExpectations

@@ -4921 +4921 @@
 accessibility/selected-state-changed-notifications.html [ Skip ]
 accessibility/element-line-rects-and-text.html [ Skip ]
+accessibility/dialog-properties.html [ Skip ]
 
 webkit.org/b/229247 http/tests/fetch/keepalive-fetch-2.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-13  Andres Gonzalez  <andresg_22@apple.com>
+
+        Expose the correct role, subrole and role description properties for the <dialog> element.
+        https://bugs.webkit.org/show_bug.cgi?id=236359
+
+        Reviewed by Chris Fleizach.
+
+        Test: accessibility/dialog-properties.html
+
+        Elements with role="dialog" are exposed to accessibility clients with
+        role AXGroup, subrole AXApplicationDialog and role description
+        "web dialog". This patch implements this behavior for the <dialog>
+        element.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::determineAccessibilityRoleFromNode const):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::defaultObjectInclusion const):
+
 2022-02-13  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -359 +359 @@
     if (node()->hasTagName(captionTag))
         return AccessibilityRole::Caption;
+    if (node()->hasTagName(dialogTag))
+        return AccessibilityRole::ApplicationDialog;
     if (node()->hasTagName(markTag))
         return AccessibilityRole::Mark;
@@ -415 +417 @@
     if (is<Element>(*node()) && downcast<Element>(*node()).isFocusable())
         return AccessibilityRole::Group;
-    
+
     return AccessibilityRole::Unknown;
 }

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -3613 +3613 @@
 {
     bool useParentData = !m_isIgnoredFromParentData.isNull();
-    
+
     if (useParentData ? m_isIgnoredFromParentData.isAXHidden : isAXHidden())
         return AccessibilityObjectInclusion::IgnoreObject;
@@ -3619 +3619 @@
     if ((renderer() && renderer()->style().effectiveInert()) || ignoredFromModalPresence())
         return AccessibilityObjectInclusion::IgnoreObject;
-    
+
     if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole())
         return AccessibilityObjectInclusion::IgnoreObject;
-    
+
+    // Include <dialog> elements and elements with role="dialog".
+    if (roleValue() == AccessibilityRole::ApplicationDialog)
+        return AccessibilityObjectInclusion::IncludeObject;
+
     return accessibilityPlatformIncludesObject();
 }