Changeset 287778 in webkit

Timestamp:

Jan 7, 2022, 1:09:21 PM (5 years ago)

Author:

Andres Gonzalez

Message:

WebAccessibilityObjectWrapper accessibilityHitTest should call AXCoreObject::widget() on the main thread.
​https://bugs.webkit.org/show_bug.cgi?id=234973
<rdar://problem/87264153>

Reviewed by Chris Fleizach.

In isolated tree mode, the AX object widget() method and any subsequent
access to the returned value must be dispatch to the main thread.

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityHitTest:]):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-07  Andres Gonzalez  <andresg_22@apple.com>
+
+        WebAccessibilityObjectWrapper accessibilityHitTest should call AXCoreObject::widget() on the main thread.
+        https://bugs.webkit.org/show_bug.cgi?id=234973
+        <rdar://problem/87264153>
+
+        Reviewed by Chris Fleizach.
+
+        In isolated tree mode, the AX object widget() method and any subsequent
+        access to the returned value must be dispatch to the main thread.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityHitTest:]):
+
 2022-01-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -2953 +2953 @@
     auto* axObject = backingObject->accessibilityHitTest(IntPoint(point));
 
+    id hit = nil;
     if (axObject) {
         if (axObject->isAttachment() && [axObject->wrapper() attachmentView])
             return [axObject->wrapper() attachmentView];
-        auto* widget = axObject->widget();
-        if (is<PluginViewBase>(widget))
-            return NSAccessibilityUnignoredAncestor(widget->accessibilityHitTest(IntPoint(point)));
-        return NSAccessibilityUnignoredAncestor(axObject->wrapper());
-    }
-    return NSAccessibilityUnignoredAncestor(self);
+
+        hit = Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&axObject, &point] () -> RetainPtr<id> {
+            auto* widget = axObject->widget();
+            if (is<PluginViewBase>(widget))
+                return widget->accessibilityHitTest(IntPoint(point));
+            return nil;
+        });
+
+        if (!hit)
+            hit = axObject->wrapper();
+    } else
+        hit = self;
+
+    return NSAccessibilityUnignoredAncestor(hit);
 }