Title: [176003] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 176003
- Author
- [email protected]
- Date
- 2014-11-11 20:33:35 -0800 (Tue, 11 Nov 2014)
Log Message
Merged r175996. rdar://problem/18949376
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176002 => 176003)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-12 04:29:54 UTC (rev 176002)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-12 04:33:35 UTC (rev 176003)
@@ -1,3 +1,20 @@
+2014-11-11 Babak Shafiei <[email protected]>
+
+ Merge r175996.
+
+ 2014-11-11 Beth Dakin <[email protected]>
+
+ 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 Matthew Hanson <[email protected]>
Merge r175821. <rdar://problem/18929733>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176002 => 176003)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-12 04:29:54 UTC (rev 176002)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-12 04:33:35 UTC (rev 176003)
@@ -117,7 +117,7 @@
[actionMenu removeAllItems];
- WebElementDictionary *hitTestResult = [self performHitTestAtPoint:[_webView convertPoint:event.locationInWindow fromView:nil]];
+ WebElementDictionary *hitTestResult = [self performHitTestAtPoint:event.locationInWindow];
NSArray *menuItems = [self _defaultMenuItemsForHitTestResult:hitTestResult];
// Allow clients to customize the menu items.
@@ -336,7 +336,6 @@
NSPoint textBaselineOrigin = popupInfo.origin;
// Convert to screen coordinates.
- textBaselineOrigin = [_webView convertPoint:textBaselineOrigin toView:nil];
textBaselineOrigin = [_webView.window convertRectToScreen:NSMakeRect(textBaselineOrigin.x, textBaselineOrigin.y, 0, 0)].origin;
WKShowWordDefinitionWindow(popupInfo.attributedString.get(), textBaselineOrigin, popupInfo.options.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
