Changeset 282956 in webkit

Timestamp:

Sep 23, 2021, 4:54:55 AM (4 years ago)

Author:

ntim@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (3 diffs)
• accessibility/AccessibilityObject.h (modified) (1 diff)
• accessibility/AccessibilityObjectInterface.h (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -3228 +3228 @@
 bool AccessibilityObject::isAXHidden() const
 {
-    if (node() && node()->isInert())
-        return true;
-
     if (isFocused())
         return false;
@@ -3251 +3248 @@
 }
 
+bool AccessibilityObject::isInert() const
+{
+    return node() && node()->isInert();
+}
+
 bool AccessibilityObject::isShowingValidationMessage() const
 {
@@ -3272 +3274 @@
         return AccessibilityObjectInclusion::IgnoreObject;
     
-    if (ignoredFromModalPresence())
+    if (isInert() || ignoredFromModalPresence())
         return AccessibilityObjectInclusion::IgnoreObject;
     

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -701 +701 @@
     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)

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -1439 +1439 @@
     virtual bool isAXHidden() const = 0;
     virtual bool isDOMHidden() const = 0;
+    virtual bool isInert() const = 0;
     virtual bool isHidden() const = 0;
 

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -2318 +2318 @@
 }
 
+bool AXIsolatedObject::isInert() const
+{
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
 bool AXIsolatedObject::isHidden() const
 {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -643 +643 @@
     bool isAXHidden() const override;
     bool isDOMHidden() const override;
+    bool isInert() const override;
     bool isHidden() const override;
     void overrideAttachmentParent(AXCoreObject* parent) override;