Changeset 166224 in webkit

Timestamp:

Mar 24, 2014 11:34:30 PM (10 years ago)

Author:

Chris Fleizach

Message:

AX: hit-testing doesn't always work correctly with WK2
​https://bugs.webkit.org/show_bug.cgi?id=130706

Reviewed by Simon Fraser.

Accessibility code was trying to do screenToRootView itself, and in
some cases with embedded WK2 views that did not work.

• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:

(-[WKAccessibilityWebPageObject accessibilityHitTest:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-24  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: hit-testing doesn't always work correctly with WK2
+        https://bugs.webkit.org/show_bug.cgi?id=130706
+
+        Reviewed by Simon Fraser.
+
+        Accessibility code was trying to do screenToRootView itself, and in 
+        some cases with embedded WK2 views that did not work.
+
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+        (-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
 2014-03-24  Benjamin Poulain  <bpoulain@apple.com>
 

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

@@ -194 +194 @@
 - (id)accessibilityHitTest:(NSPoint)point
 {
-    // Hit-test point comes in as bottom-screen coordinates. Needs to be normalized to the frame of the web page.
-    NSPoint remotePosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue];
-    NSSize remoteSize = [[self accessibilityAttributeValue:NSAccessibilitySizeAttribute] sizeValue];
-    
-    // Get the y position of the WKView (we have to screen-flip and go from bottom left to top left).
-    CGFloat screenHeight = [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height;
-    remotePosition.y = (screenHeight - remotePosition.y) - remoteSize.height;
-    
-    point.y = screenHeight - point.y;
-    
-    // Re-center point into the web page's frame.
-    point.y -= remotePosition.y;
-    point.x -= remotePosition.x;
-    
-    WebCore::FrameView* frameView = m_page ? m_page->mainFrameView() : 0;
-    if (frameView) {
-        point.y += frameView->scrollPosition().y();
-        point.x += frameView->scrollPosition().x();
-    }
-    
-    return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
+    if (!m_page)
+        return nil;
+    
+    IntPoint convertedPoint = m_page->screenToRootView(IntPoint(point));
+    if (WebCore::FrameView* frameView = m_page->mainFrameView())
+        convertedPoint.moveBy(frameView->scrollPosition());
+        
+    return [[self accessibilityRootObjectWrapper] accessibilityHitTest:convertedPoint];
 }
 #pragma clang diagnostic pop