Title: [295593] trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
- Revision
- 295593
- Author
- [email protected]
- Date
- 2022-06-16 08:05:12 -0700 (Thu, 16 Jun 2022)
Log Message
AX ITM: VoiceOver cannot get contextual menus for links on some pages with ITM enabled.
https://bugs.webkit.org/show_bug.cgi?id=241668
Reviewed by Chris Fleizach.
In isolated tree mode the performSelector method was being called off the main thread, and was not invoking the given selector. This patch fixes the problem by dispatching to the main thread the call to performSelector. Some code cleanup.
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityPerformShowMenuAction]):
(-[WebAccessibilityObjectWrapper _accessibilityShowContextMenu]):
(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]): Deleted.
Canonical link: https://commits.webkit.org/251598@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (295592 => 295593)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2022-06-16 14:46:31 UTC (rev 295592)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2022-06-16 15:05:12 UTC (rev 295593)
@@ -2947,19 +2947,21 @@
- (void)accessibilityPerformShowMenuAction
{
- if (self.axBackingObject->roleValue() == AccessibilityRole::ComboBox)
- self.axBackingObject->setIsExpanded(true);
- else {
- // This needs to be performed in an iteration of the run loop that did not start from an AX call.
- // If it's the same run loop iteration, the menu open notification won't be sent
- [self performSelector:@selector(accessibilityShowContextMenu) withObject:nil afterDelay:0.0];
+ auto* backingObject = self.axBackingObject;
+ if (!backingObject) {
+ [self logMissingBackingObject];
+ return;
}
-}
-- (void)accessibilityShowContextMenu
-{
+ if (backingObject->roleValue() == AccessibilityRole::ComboBox) {
+ backingObject->setIsExpanded(true);
+ return;
+ }
+
Accessibility::performFunctionOnMainThread([protectedSelf = retainPtr(self)] {
- [protectedSelf _accessibilityShowContextMenu];
+ // This needs to be performed in an iteration of the run loop that did not start from an AX call.
+ // If it's the same run loop iteration, the menu open notification won't be sent.
+ [protectedSelf performSelector:@selector(_accessibilityShowContextMenu) withObject:nil afterDelay:0.0];
});
}
@@ -2966,31 +2968,31 @@
- (void)_accessibilityShowContextMenu
{
ASSERT(isMainThread());
-
- if (!self.axBackingObject)
+
+ auto* backingObject = self.axBackingObject;
+ if (!backingObject) {
+ [self logMissingBackingObject];
return;
-
- Page* page = self.axBackingObject->page();
+ }
+
+ Page* page = backingObject->page();
if (!page)
return;
-
- IntRect rect = snappedIntRect(self.axBackingObject->elementRect());
- FrameView* frameView = self.axBackingObject->documentFrameView();
-
+
+ IntRect rect = snappedIntRect(backingObject->elementRect());
// On WK2, we need to account for the scroll position with regards to root view.
// On WK1, we need to convert rect to window space to match mouse clicking.
+ auto* frameView = backingObject->documentFrameView();
if (frameView) {
- // Find the appropriate scroll view to use to convert the contents to the window.
- for (auto* parent = self.axBackingObject->parentObject(); parent; parent = parent->parentObject()) {
- if (parent->isScrollView()) {
- if (auto* scrollView = parent->scrollView()) {
- if (!frameView->platformWidget())
- rect = scrollView->contentsToRootView(rect);
- else
- rect = scrollView->contentsToWindow(rect);
- }
- break;
- }
+ // Find the appropriate scroll view to convert the coordinates to window space.
+ auto* axScrollView = Accessibility::findAncestor(*backingObject, false, [] (const auto& ancestor) {
+ return ancestor.isScrollView() && ancestor.scrollView();
+ });
+ if (axScrollView) {
+ if (!frameView->platformWidget())
+ rect = axScrollView->scrollView()->contentsToRootView(rect);
+ else
+ rect = axScrollView->scrollView()->contentsToWindow(rect);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
