Changeset 295307 in webkit

Timestamp:

Jun 6, 2022, 5:35:49 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 077f4d227924. rdar://problem/94034984

AX: inert attribute doesn't cause display:contents element to be ignored
​https://bugs.webkit.org/show_bug.cgi?id=241022

Reviewed by Chris Fleizach.

Prior to this patch, the inert attribute didn't cause node-only objects
(like those with display:contents) to be ignored. This was because
AccessibilityObject::defaultObjectInclusion only checked effectiveInert
for elements with renderers, even though you only need an element to
have style (not a renderer).

This patch fixes this by adding a new AccessibilityObject::style()
method which uses AccessibilityObject::element() to get
Element::computedStyle() and checking effectiveInert on that, which
works for both renderer and renderer-less objects.

• LayoutTests/accessibility/node-only-inert-object-expected.txt: Added.
• LayoutTests/accessibility/node-only-inert-object.html: Added.
• LayoutTests/platform/ios/TestExpectations: Enable new test.
• LayoutTests/platform/mac-wk1/TestExpectations: Skip new test.
• Source/WebCore/accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::style const): Added. (WebCore::AccessibilityObject::defaultObjectInclusion const):
• Source/WebCore/accessibility/AccessibilityObject.h:

Canonical link: ​https://commits.webkit.org/251185@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@295090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch

Files:

• LayoutTests/accessibility/node-only-inert-object-expected.txt (added)
• LayoutTests/accessibility/node-only-inert-object.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)

branches/safari-613-branch/LayoutTests/platform/ios/TestExpectations

@@ -2094 +2094 @@
 fast/dom/linkify-phone-numbers.html [ Pass ]
 
+accessibility/node-only-inert-object.html [ Pass ]
 accessibility/video-element-url-attribute.html [ Pass ]
 accessibility/visible-character-range.html [ Pass ]

branches/safari-613-branch/LayoutTests/platform/mac-wk1/TestExpectations

@@ -606 +606 @@
 editing/spelling/spelling-unified-emulation.html [ Failure ]
 
+# The inert attribute isn't making objects inaccessible on WK1.
+accessibility/node-only-inert-object.html [ Failure ]
+
 # Skip due to lack of DumpRenderTree `AccessibilityUIElement::stringDescriptionOfAttributeValue` implementation.
 accessibility/visible-character-range.html [ Skip ]

branches/safari-613-branch/LayoutTests/platform/win/TestExpectations

@@ -273 +273 @@
 # TODO Accept header is handled by the browser
 http/tests/misc/image-checks-for-accept.html [ Skip ]
+
+# Failing since added in https://bugs.webkit.org/show_bug.cgi?id=241022.
+accessibility/node-only-inert-object.html [ Failure ]
 
 # Need to implement AccessibilityUIElement::clearSelectedChildren()

branches/safari-613-branch/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -2639 +2639 @@
     return nullptr;
 }
-    
+
+const RenderStyle* AccessibilityObject::style() const
+{
+    if (auto* element = this->element())
+        return element->computedStyle();
+    return nullptr;
+}
+
 bool AccessibilityObject::isValueAutofillAvailable() const
 {
@@ -3547 +3554 @@
         return AccessibilityObjectInclusion::IgnoreObject;
 
-    if (renderer() && renderer()->style().effectiveInert())
+    auto* style = this->style();
+    if (style && style->effectiveInert())
         return AccessibilityObjectInclusion::IgnoreObject;
 

branches/safari-613-branch/Source/WebCore/accessibility/AccessibilityObject.h

@@ -274 +274 @@
     Node* node() const override { return nullptr; }
     RenderObject* renderer() const override { return nullptr; }
+    const RenderStyle* style() const;
+
     // Note: computeAccessibilityIsIgnored does not consider whether an object is ignored due to presence of modals.
     // Use accessibilityIsIgnored as the word of law when determining if an object is ignored.