Title: [294894] trunk/Source/WebCore/accessibility/isolatedtree
- Revision
- 294894
- Author
- [email protected]
- Date
- 2022-05-26 13:19:17 -0700 (Thu, 26 May 2022)
Log Message
AX: Don't create isolated objects from ignored live objects
https://bugs.webkit.org/show_bug.cgi?id=240507
Reviewed by Chris Fleizach.
Sometimes, we can get into a state where a live object has dynamically
become ignored but not removed as a child from its parent (since
unignored objects are the only thing that should be in any
AccessibilityObject::m_children). This can cause us to create an
isolated object for this ignored live object.
With this change, we now return a std::nullopt NodeChange for an
ignored live object.
I split this change off from a different patch improving our handling of
modals. It is required to make accessibility/aria-modal-multiple-dialogs.html
pass in isolated tree mode.
* Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:
(WebCore::AXIsolatedTree::nodeChangeForObject):
(WebCore::AXIsolatedTree::queueRemovalsAndUnresolvedChanges):
(WebCore::AXIsolatedTree::updateNode):
* Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h:
Canonical link: https://commits.webkit.org/251016@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp (294893 => 294894)
--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp 2022-05-26 20:18:36 UTC (rev 294893)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp 2022-05-26 20:19:17 UTC (rev 294894)
@@ -181,19 +181,23 @@
queueRemovalsAndUnresolvedChanges({ });
}
-AXIsolatedTree::NodeChange AXIsolatedTree::nodeChangeForObject(AXCoreObject& axObject, AttachWrapper attachWrapper)
+std::optional<AXIsolatedTree::NodeChange> AXIsolatedTree::nodeChangeForObject(AXCoreObject& axObject, AttachWrapper attachWrapper)
{
ASSERT(isMainThread());
- auto object = AXIsolatedObject::create(axObject, this);
- NodeChange nodeChange { object, nullptr };
+ // We should never create an isolated object from an ignored object.
+ if (axObject.accessibilityIsIgnored())
+ return std::nullopt;
- if (!object->objectID().isValid()) {
+ if (!axObject.objectID().isValid()) {
// Either the axObject has an invalid ID or something else went terribly wrong. Don't bother doing anything else.
ASSERT_NOT_REACHED();
- return nodeChange;
+ return std::nullopt;
}
+ auto object = AXIsolatedObject::create(axObject, this);
+ NodeChange nodeChange { object, nullptr };
+
ASSERT(axObject.wrapper());
if (attachWrapper == AttachWrapper::OnMainThread)
object->attachPlatformWrapper(axObject.wrapper());
@@ -260,7 +264,8 @@
resolvedAppends.reserveInitialCapacity(m_unresolvedPendingAppends.size());
for (const auto& unresolvedAppend : m_unresolvedPendingAppends) {
if (auto* axObject = cache->objectFromAXID(unresolvedAppend.key))
- resolvedAppends.uncheckedAppend(nodeChangeForObject(*axObject, unresolvedAppend.value));
+ if (auto nodeChange = nodeChangeForObject(*axObject, unresolvedAppend.value))
+ resolvedAppends.uncheckedAppend(WTFMove(*nodeChange));
}
m_unresolvedPendingAppends.clear();
}
@@ -306,9 +311,10 @@
// Otherwise, resolve the change immediately and queue it up.
// In both cases, we can't attach the wrapper immediately on the main thread, since the wrapper could be in use
// on the AX thread (because this function updates an existing node).
- auto change = nodeChangeForObject(axObject, AttachWrapper::OnAXThread);
- Locker locker { m_changeLogLock };
- queueChange(change);
+ if (auto change = nodeChangeForObject(axObject, AttachWrapper::OnAXThread)) {
+ Locker locker { m_changeLogLock };
+ queueChange(WTFMove(*change));
+ }
}
void AXIsolatedTree::updateNodeProperty(AXCoreObject& axObject, AXPropertyName property)
Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h (294893 => 294894)
--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h 2022-05-26 20:18:36 UTC (rev 294893)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.h 2022-05-26 20:19:17 UTC (rev 294894)
@@ -386,7 +386,7 @@
static HashMap<PageIdentifier, Ref<AXIsolatedTree>>& treePageCache() WTF_REQUIRES_LOCK(s_cacheLock);
enum class AttachWrapper : bool { OnMainThread, OnAXThread };
- NodeChange nodeChangeForObject(AXCoreObject&, AttachWrapper = AttachWrapper::OnMainThread);
+ std::optional<NodeChange> nodeChangeForObject(AXCoreObject&, AttachWrapper = AttachWrapper::OnMainThread);
void collectNodeChangesForSubtree(AXCoreObject&);
void queueChange(const NodeChange&) WTF_REQUIRES_LOCK(m_changeLogLock);
void queueRemovals(const Vector<AXID>&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
