Title: [287880] trunk/Source/WebCore
Revision
287880
Author
[email protected]
Date
2022-01-11 07:44:23 -0800 (Tue, 11 Jan 2022)

Log Message

Make [WebAccessibilityObjectWrapperBase axBackingObject] return the appropriate underlying object for the calling thread.
https://bugs.webkit.org/show_bug.cgi?id=235046
<rdar://problem/87358177>

Reviewed by Chris Fleizach.

In isolated tree mode, WebAccessibilityObjectWrapperBase axBackingObject
can be called on and off the main thread. This change ensures that the
AXIsolatedObject is always returned off the main thread, while the
AXObejct is always returned on the main thread, which is the required
behavior.

* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(-[WebAccessibilityObjectWrapperBase axBackingObject]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (287879 => 287880)


--- trunk/Source/WebCore/ChangeLog	2022-01-11 15:41:14 UTC (rev 287879)
+++ trunk/Source/WebCore/ChangeLog	2022-01-11 15:44:23 UTC (rev 287880)
@@ -1,3 +1,20 @@
+2022-01-11  Andres Gonzalez  <[email protected]>
+
+        Make [WebAccessibilityObjectWrapperBase axBackingObject] return the appropriate underlying object for the calling thread.
+        https://bugs.webkit.org/show_bug.cgi?id=235046
+        <rdar://problem/87358177>
+
+        Reviewed by Chris Fleizach.
+
+        In isolated tree mode, WebAccessibilityObjectWrapperBase axBackingObject
+        can be called on and off the main thread. This change ensures that the
+        AXIsolatedObject is always returned off the main thread, while the
+        AXObejct is always returned on the main thread, which is the required
+        behavior.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+        (-[WebAccessibilityObjectWrapperBase axBackingObject]):
+
 2022-01-11  Sam Weinig  <[email protected]>
 
         Remove AppleTV specific disabling of conic gradients, its not necessary

Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (287879 => 287880)


--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	2022-01-11 15:41:14 UTC (rev 287879)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	2022-01-11 15:44:23 UTC (rev 287880)
@@ -364,11 +364,16 @@
 
 - (WebCore::AXCoreObject*)axBackingObject
 {
+    if (isMainThread())
+        return m_axObject;
+
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-    if (AXObjectCache::isIsolatedTreeEnabled())
-        return m_isolatedObject;
+    ASSERT(AXObjectCache::isIsolatedTreeEnabled());
+    return m_isolatedObject;
+#else
+    ASSERT_NOT_REACHED();
+    return nullptr;
 #endif
-    return m_axObject;
 }
 
 - (BOOL)isIsolatedObject
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to