Changeset 287880 in webkit

Timestamp:

Jan 11, 2022, 7:44:23 AM (5 years ago)

Author:

Andres Gonzalez

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]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapperBase.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-11  Andres Gonzalez  <andresg_22@apple.com>
+
+        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  <weinig@apple.com>
 

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm

@@ -365 +365 @@
 - (WebCore::AXCoreObject*)axBackingObject
 {
+    if (isMainThread())
+        return m_axObject;
+
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-    if (AXObjectCache::isIsolatedTreeEnabled())
-        return m_isolatedObject;
-#endif
-    return m_axObject;
+    ASSERT(AXObjectCache::isIsolatedTreeEnabled());
+    return m_isolatedObject;
+#else
+    ASSERT_NOT_REACHED();
+    return nullptr;
+#endif
 }