Changeset 175996 in webkit

Timestamp:

Nov 11, 2014, 5:29:43 PM (12 years ago)

Author:

Beth Dakin

Message:

Action menu hit testing is not working properly with all WK1 apps
​https://bugs.webkit.org/show_bug.cgi?id=138643
-and corresponding-
rdar://problem/18949376

Reviewed by Tim Horton.

• WebView/WebActionMenuController.mm:

(-[WebActionMenuController prepareForMenu:withEvent:]):
(-[WebActionMenuController _lookupText:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebActionMenuController.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-11-11  Beth Dakin  <bdakin@apple.com>
+
+        Action menu hit testing is not working properly with all WK1 apps
+        https://bugs.webkit.org/show_bug.cgi?id=138643
+        -and corresponding-
+        rdar://problem/18949376
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebActionMenuController.mm:
+        (-[WebActionMenuController prepareForMenu:withEvent:]):
+        (-[WebActionMenuController _lookupText:]):
+
 2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm

@@ -118 +118 @@
     [actionMenu removeAllItems];
 
-    WebElementDictionary *hitTestResult = [self performHitTestAtPoint:[_webView convertPoint:event.locationInWindow fromView:nil]];
+    WebElementDictionary *hitTestResult = [self performHitTestAtPoint:event.locationInWindow];
     NSArray *menuItems = [self _defaultMenuItemsForHitTestResult:hitTestResult];
 
@@ -337 +337 @@
 
     // Convert to screen coordinates.
-    textBaselineOrigin = [_webView convertPoint:textBaselineOrigin toView:nil];
     textBaselineOrigin = [_webView.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;