Changeset 274377 in webkit

Timestamp:

Mar 12, 2021 6:26:50 PM (16 months ago)

Author:

Chris Fleizach

Message:

AX: PDF frame conversion routines need to be updated
​https://bugs.webkit.org/show_bug.cgi?id=223138

Reviewed by Darin Adler.

PDF bounding boxes are wrong in WebKit because.

1) There's no way for PDF objects to get the primary screen height. So we need to be able to return the primary

screen height from an object in the PDF hierarchy.

2) The WKPDFPluginAccessibilityObject's position was not being converted correctly.

• WebProcess/Plugins/PDF/PDFPlugin.mm:

(-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:]):
(-[WKPDFPluginAccessibilityObject ALLOW_DEPRECATED_IMPLEMENTATIONS_END]):
(WebKit::PDFPlugin::boundsOnScreen const):

• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:

(-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (3 diffs)
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-12  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: PDF frame conversion routines need to be updated
+        https://bugs.webkit.org/show_bug.cgi?id=223138
+
+        Reviewed by Darin Adler.
+
+        PDF bounding boxes are wrong in WebKit because.
+          1) There's no way for PDF objects to get the primary screen height. So we need to be able to return the primary
+             screen height from an object in the PDF hierarchy.
+          2) The WKPDFPluginAccessibilityObject's position was not being converted correctly.
+
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (-[WKPDFPluginAccessibilityObject accessibilityAttributeValue:]):
+        (-[WKPDFPluginAccessibilityObject ALLOW_DEPRECATED_IMPLEMENTATIONS_END]):
+        (WebKit::PDFPlugin::boundsOnScreen const):
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+        (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
+
 2021-03-12  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -227 +227 @@
     if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
         return NSAccessibilityGroupRole;
+    if ([attribute isEqualToString:NSAccessibilityPrimaryScreenHeightAttribute])
+        return [_parent accessibilityAttributeValue:NSAccessibilityPrimaryScreenHeightAttribute];
 
     return 0;
@@ -270 +272 @@
         NSAccessibilityFocusedAttribute,
         // PDFLayerController has its own accessibilityChildren.
-        NSAccessibilityChildrenAttribute
+        NSAccessibilityChildrenAttribute,
+        NSAccessibilityPrimaryScreenHeightAttribute
     ];
 
@@ -2050 +2053 @@
     FloatRect bounds = FloatRect(FloatPoint(), size());
     FloatRect rectInRootViewCoordinates = m_rootViewToPluginTransform.inverse().valueOr(AffineTransform()).mapRect(bounds);
-    return frameView->contentsToScreen(enclosingIntRect(rectInRootViewCoordinates));
+    auto* page = m_frame->coreFrame()->page();
+    if (!page)
+        return { };
+    return page->chrome().rootViewToScreen(enclosingIntRect(rectInRootViewCoordinates));
 }
 

trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm

@@ -43 +43 @@
 #import <WebCore/Page.h>
 #import <WebCore/PageOverlayController.h>
+#import <WebCore/PlatformScreen.h>
 #import <WebCore/ScrollView.h>
 #import <WebCore/Scrollbar.h>
@@ -185 +186 @@
     
     if ([attribute isEqualToString:NSAccessibilityPrimaryScreenHeightAttribute])
-        return [[self accessibilityRootObjectWrapper] accessibilityAttributeValue:attribute];
+        return @(WebCore::screenRectForPrimaryScreen().size().height());
     
     if ([attribute isEqualToString:NSAccessibilitySizeAttribute])