AX: Stop exposing isInert & ignoredFromModalPresence in AXCoreObject …

…& AXIsolatedObject https://bugs.webkit.org/show_bug.cgi?id=230690 Reviewed by Chris Fleizach. * accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::defaultObjectInclusion const): (WebCore::AccessibilityObject::isInert const): Deleted. * accessibility/AccessibilityObject.h: * accessibility/AccessibilityObjectInterface.h: * accessibility/isolatedtree/AXIsolatedObject.cpp: (WebCore::AXIsolatedObject::ignoredFromModalPresence const): Deleted. (WebCore::AXIsolatedObject::isInert const): Deleted. * accessibility/isolatedtree/AXIsolatedObject.h: Canonical link: https://commits.webkit.org/242054@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282964 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Sep 23, 2021 · 721e2c1 · 721e2c1
1 parent 65762f8
commit 721e2c1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 25 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2021-09-23  Tim Nguyen  <ntim@apple.com>
+
+        AX: Stop exposing isInert & ignoredFromModalPresence in AXCoreObject & AXIsolatedObject
+        https://bugs.webkit.org/show_bug.cgi?id=230690
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::defaultObjectInclusion const):
+        (WebCore::AccessibilityObject::isInert const): Deleted.
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::ignoredFromModalPresence const): Deleted.
+        (WebCore::AXIsolatedObject::isInert const): Deleted.
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2021-09-23  Alan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Move Layout::Run under InlineDisplay and rename it to Box

diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -3247,11 +3247,6 @@ 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()))
@@ -3273,7 +3268,7 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
     if (useParentData ? m_isIgnoredFromParentData.isAXHidden : isAXHidden())
         return AccessibilityObjectInclusion::IgnoreObject;
 
-    if (isInert() || ignoredFromModalPresence())
+    if ((node() && node()->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
@@ -319,7 +319,7 @@ class AccessibilityObject : public AXCoreObject {
     const String keyShortcutsValue() const override;
 
     // This function checks if the object should be ignored when there's a modal dialog displayed.
-    bool ignoredFromModalPresence() const override;
+    virtual bool ignoredFromModalPresence() const;
     bool isModalDescendant(Node*) const override;
     bool isModalNode() const override;
 
@@ -700,8 +700,7 @@ class AccessibilityObject : public AXCoreObject {
     // Visibility.
     bool isAXHidden() const override;
     bool isDOMHidden() const override;
-    bool isInert() const override;
-    bool isHidden() const override { return isAXHidden() || isDOMHidden() || isInert(); }
+    bool isHidden() const override { return isAXHidden() || isDOMHidden(); }
 
 #if PLATFORM(COCOA)
     void overrideAttachmentParent(AXCoreObject* parent) override;

diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h
@@ -1068,7 +1068,6 @@ class AXCoreObject : public ThreadSafeRefCounted<AXCoreObject> {
     virtual const String keyShortcutsValue() const = 0;
 
     // This function checks if the object should be ignored when there's a modal dialog displayed.
-    virtual bool ignoredFromModalPresence() const = 0;
     virtual bool isModalDescendant(Node*) const = 0;
     virtual bool isModalNode() const = 0;
 
@@ -1438,7 +1437,6 @@ 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
@@ -1825,12 +1825,6 @@ bool AXIsolatedObject::supportsChecked() const
     return false;
 }
 
-bool AXIsolatedObject::ignoredFromModalPresence() const
-{
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
 bool AXIsolatedObject::isModalDescendant(Node*) const
 {
     ASSERT_NOT_REACHED();
@@ -2317,12 +2311,6 @@ 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
@@ -547,7 +547,6 @@ class AXIsolatedObject final : public AXCoreObject {
     bool supportsPressed() const override;
     bool supportsChecked() const override;
     bool supportsRowCountChange() const override { return boolAttributeValue(AXPropertyName::SupportsRowCountChange); }
-    bool ignoredFromModalPresence() const override;
     bool isModalDescendant(Node*) const override;
     bool isModalNode() const override;
     AXCoreObject* elementAccessibilityHitTest(const IntPoint&) const override;
@@ -642,7 +641,6 @@ 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;