Title: [282964] trunk/Source/WebCore
- Revision
- 282964
- Author
- [email protected]
- Date
- 2021-09-23 09:42:10 -0700 (Thu, 23 Sep 2021)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (282963 => 282964)
--- trunk/Source/WebCore/ChangeLog 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/ChangeLog 2021-09-23 16:42:10 UTC (rev 282964)
@@ -1,3 +1,20 @@
+2021-09-23 Tim Nguyen <[email protected]>
+
+ 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 <[email protected]>
[LFC][IFC] Move Layout::Run under InlineDisplay and rename it to Box
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (282963 => 282964)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2021-09-23 16:42:10 UTC (rev 282964)
@@ -3247,11 +3247,6 @@
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 @@
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())
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (282963 => 282964)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2021-09-23 16:42:10 UTC (rev 282964)
@@ -319,7 +319,7 @@
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 @@
// 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;
Modified: trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h (282963 => 282964)
--- trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h 2021-09-23 16:42:10 UTC (rev 282964)
@@ -1068,7 +1068,6 @@
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 @@
// Visibility.
virtual bool isAXHidden() const = 0;
virtual bool isDOMHidden() const = 0;
- virtual bool isInert() const = 0;
virtual bool isHidden() const = 0;
#if ENABLE(ACCESSIBILITY)
Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp (282963 => 282964)
--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp 2021-09-23 16:42:10 UTC (rev 282964)
@@ -1825,12 +1825,6 @@
return false;
}
-bool AXIsolatedObject::ignoredFromModalPresence() const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
bool AXIsolatedObject::isModalDescendant(Node*) const
{
ASSERT_NOT_REACHED();
@@ -2317,12 +2311,6 @@
return false;
}
-bool AXIsolatedObject::isInert() const
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
bool AXIsolatedObject::isHidden() const
{
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h (282963 => 282964)
--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h 2021-09-23 16:02:34 UTC (rev 282963)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h 2021-09-23 16:42:10 UTC (rev 282964)
@@ -547,7 +547,6 @@
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 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
