AX: Split out isInert from isAXHidden on AccessibilityObject

nt1m · nt1m · commit 969f93d0bf41 · 2021-09-23T11:54:55.000Z
https://bugs.webkit.org/show_bug.cgi?id=230680 Reviewed by Antti Koivisto. Reasons to do this are: - Naming of isAXHidden is a bit of a lie - We don't want to inherit inert state from parent to child like we do for aria-hidden, especially in the document is blocked by modal dialog case, where the modal should be interactable unlike its ancestors/siblings. * accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::isAXHidden const): (WebCore::AccessibilityObject::isInert const): (WebCore::AccessibilityObject::defaultObjectInclusion const): * accessibility/AccessibilityObject.h: * accessibility/AccessibilityObjectInterface.h: * accessibility/isolatedtree/AXIsolatedObject.cpp: (WebCore::AXIsolatedObject::isInert const): * accessibility/isolatedtree/AXIsolatedObject.h: Canonical link: https://commits.webkit.org/242046@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282956 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2021-09-23  Tim Nguyen  <ntim@apple.com>
+
+        AX: Split out isInert from isAXHidden on AccessibilityObject
+        https://bugs.webkit.org/show_bug.cgi?id=230680
+
+        Reviewed by Antti Koivisto.
+
+        Reasons to do this are:
+        - Naming of isAXHidden is a bit of a lie
+        - We don't want to inherit inert state from parent to child like we do for aria-hidden, especially
+        in the document is blocked by modal dialog case, where the modal should be interactable unlike its ancestors/siblings.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isAXHidden const):
+        (WebCore::AccessibilityObject::isInert const):
+        (WebCore::AccessibilityObject::defaultObjectInclusion const):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::isInert const):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2021-09-23  Tim Nguyen  <ntim@apple.com>
 
         Replace `axObject->isAXHidden() || axObject->isDOMHidden()` with `axObject->isHidden()`
diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -3227,9 +3227,6 @@ bool AccessibilityObject::accessibilityIsIgnoredByDefault() const
 // http://www.w3.org/TR/wai-aria/terms#def_hidden
 bool AccessibilityObject::isAXHidden() const
 {
-    if (node() && node()->isInert())
-        return true;
-
     if (isFocused())
         return false;
     
@@ -3250,6 +3247,11 @@ bool AccessibilityObject::isDOMHidden() const
     return style.display() == DisplayType::None || style.visibility() != Visibility::Visible;
 }
 
+bool AccessibilityObject::isInert() const
+{
+    return node() && node()->isInert();
+}
+
 bool AccessibilityObject::isShowingValidationMessage() const
 {
     if (is<HTMLFormControlElement>(node()))
@@ -3271,7 +3273,7 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
     if (useParentData ? m_isIgnoredFromParentData.isAXHidden : isAXHidden())
         return AccessibilityObjectInclusion::IgnoreObject;
     
-    if (ignoredFromModalPresence())
+    if (isInert() || ignoredFromModalPresence())
         return AccessibilityObjectInclusion::IgnoreObject;
     
     if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole())
diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
@@ -700,7 +700,8 @@ class AccessibilityObject : public AXCoreObject {
     // Visibility.
     bool isAXHidden() const override;
     bool isDOMHidden() const override;
-    bool isHidden() const override { return isAXHidden() || isDOMHidden(); }
+    bool isInert() const override;
+    bool isHidden() const override { return isAXHidden() || isDOMHidden() || isInert(); }
 
 #if PLATFORM(COCOA)
     void overrideAttachmentParent(AXCoreObject* parent) override;
diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h
@@ -1438,6 +1438,7 @@ class AXCoreObject : public ThreadSafeRefCounted<AXCoreObject> {
     // Visibility.
     virtual bool isAXHidden() const = 0;
     virtual bool isDOMHidden() const = 0;
+    virtual bool isInert() const = 0;
     virtual bool isHidden() const = 0;
 
 #if ENABLE(ACCESSIBILITY)
diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
@@ -2317,6 +2317,12 @@ bool AXIsolatedObject::isDOMHidden() const
     return false;
 }
 
+bool AXIsolatedObject::isInert() const
+{
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
 bool AXIsolatedObject::isHidden() const
 {
     ASSERT_NOT_REACHED();
diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h b/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h
@@ -642,6 +642,7 @@ class AXIsolatedObject final : public AXCoreObject {
     bool isMathMultiscriptObject(AccessibilityMathMultiscriptObjectType) const override;
     bool isAXHidden() const override;
     bool isDOMHidden() const override;
+    bool isInert() const override;
     bool isHidden() const override;
     void overrideAttachmentParent(AXCoreObject* parent) override;
     bool accessibilityIgnoreAttachment() const override;

Original file line number	Diff line number	Diff line change
`@@ -2317,6 +2317,12 @@ bool AXIsolatedObject::isDOMHidden() const`
`2317`	`2317`	`return false;`
`2318`	`2318`	`}`
`2319`	`2319`
	`2320`	`+bool AXIsolatedObject::isInert() const`
	`2321`	`+{`
	`2322`	`+ ASSERT_NOT_REACHED();`
	`2323`	`+ return false;`
	`2324`	`+}`
	`2325`	`+`
`2320`	`2326`	`bool AXIsolatedObject::isHidden() const`
`2321`	`2327`	`{`
`2322`	`2328`	`ASSERT_NOT_REACHED();`