AX: Accessible name computed incorrectly for display:contents element…

…s that rely on labels or captions ("title UI elements") https://bugs.webkit.org/show_bug.cgi?id=255910 rdar://problem/108492642 Reviewed by Chris Fleizach. Move non-renderer-specific behavior from AccessibilityRenderObject to AccessibilityNodeObject. * Source/WebCore/accessibility/AccessibilityNodeObject.cpp: * Source/WebCore/accessibility/AccessibilityNodeObject.h: * Source/WebCore/accessibility/AccessibilityRenderObject.cpp: * LayoutTests/accessibility/mac/figure-element-expected.txt: * LayoutTests/accessibility/mac/figure-element.html: Canonical link: https://commits.webkit.org/263379@main
WebKit · Apr 25, 2023 · 2670ad1 · 2670ad1
1 parent 3161dda
commit 2670ad1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/LayoutTests/accessibility/mac/figure-element-expected.txt b/LayoutTests/accessibility/mac/figure-element-expected.txt
@@ -38,6 +38,13 @@ figure5 description: AXDescription: Figcaption element
 figure5 helpText: AXHelp: title attribute
 PASS (isIgnored(titleUIElement) && isIgnored(figureCaption)) || titleUIElement.isEqual(figureCaption) is true
 
+Test display:contents figure with figcaption element.
+figure6 role: AXRole: AXGroup
+figure6 roleDescription: AXRoleDescription: figure
+figure6 description: AXDescription: Figcaption element (display:contents)
+figure6 helpText: AXHelp:
+PASS (isIgnored(titleUIElement) && isIgnored(figureCaption)) || titleUIElement.isEqual(figureCaption) is true
+
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/accessibility/mac/figure-element.html b/LayoutTests/accessibility/mac/figure-element.html
@@ -35,6 +35,12 @@
 	<figcaption id="figCaption5">Figcaption element</figcaption>
 </figure>
 
+<p id="p6">Test display:contents figure with figcaption element.</p>
+<figure id="figure6" style="display:contents">
+	<img src="" alt="image alt" width="20" height="20"/>
+	<figcaption id="figCaption6">Figcaption element (display:contents)</figcaption>
+</figure>
+
 </div>
 
 <p id="description"></p>
@@ -50,7 +56,7 @@
 
     if (window.accessibilityController) {
 
-        for (var k = 1; k <= 5; k++) {
+        for (var k = 1; k <= 6; k++) {
            var figure = accessibilityController.accessibleElementById("figure" + k);
            var p = document.getElementById("p" + k);
            debug(p.innerText);

diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
@@ -1426,7 +1426,7 @@ AccessibilityObject* AccessibilityNodeObject::correspondingLabelForControlElemen
 
 HTMLLabelElement* AccessibilityNodeObject::labelForElement(Element* element) const
 {
-    if (!is<HTMLElement>(*element) || !downcast<HTMLElement>(*element).isLabelable())
+    if (!is<HTMLElement>(element) || !downcast<HTMLElement>(element)->isLabelable())
         return nullptr;
 
     const AtomString& id = element->getIdAttribute();
@@ -1603,6 +1603,17 @@ void AccessibilityNodeObject::titleElementText(Vector<AccessibilityText>& textOr
         textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement));
 }
 
+AccessibilityObject* AccessibilityNodeObject::titleUIElement() const
+{
+    if (!exposesTitleUIElement())
+        return nullptr;
+
+    if (isFigureElement())
+        return captionForFigure();
+
+    return axObjectCache()->getOrCreate(labelForElement(dynamicDowncast<Element>(node())));
+}
+
 bool AccessibilityNodeObject::exposesTitleUIElement() const
 {
     if (!isControl() && !isFigureElement())

diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.h b/Source/WebCore/accessibility/AccessibilityNodeObject.h
@@ -197,6 +197,7 @@ class AccessibilityNodeObject : public AccessibilityObject {
     AccessibilityObject* menuButtonForMenu() const;
     AccessibilityObject* captionForFigure() const;
     virtual void titleElementText(Vector<AccessibilityText>&) const;
+    AccessibilityObject* titleUIElement() const override;
     bool exposesTitleUIElement() const override;
 
 private:

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1089,24 +1089,10 @@ void AccessibilityRenderObject::titleElementText(Vector<AccessibilityText>& text
 
 AccessibilityObject* AccessibilityRenderObject::titleUIElement() const
 {
-    if (!m_renderer || !exposesTitleUIElement())
-        return nullptr;
-
-    // if isFieldset is true, the renderer is guaranteed to be a RenderFieldset
-    if (isFieldset())
-        return axObjectCache()->getOrCreate(downcast<RenderBlock>(*m_renderer).findFieldsetLegend(RenderBlock::FieldsetIncludeFloatingOrOutOfFlow));
-
-    if (isFigureElement())
-        return captionForFigure();
-
-    Node* node = m_renderer->node();
-    if (!is<Element>(node))
-        return nullptr;
-    HTMLLabelElement* label = labelForElement(downcast<Element>(node));
-    if (label && label->renderer())
-        return axObjectCache()->getOrCreate(label);
+    if (m_renderer && isFieldset() && exposesTitleUIElement())
+        return axObjectCache()->getOrCreate(dynamicDowncast<RenderBlock>(m_renderer.get())->findFieldsetLegend(RenderBlock::FieldsetIncludeFloatingOrOutOfFlow));
 
-    return nullptr;
+    return AccessibilityNodeObject::titleUIElement();
 }
 
 bool AccessibilityRenderObject::isAllowedChildOfTree() const