Title: [168752] branches/safari-538.34-branch/Source/WebKit/mac
Diff
Modified: branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog (168751 => 168752)
--- branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog 2014-05-13 23:30:18 UTC (rev 168751)
+++ branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog 2014-05-13 23:34:33 UTC (rev 168752)
@@ -1,3 +1,18 @@
+2014-05-13 Lucas Forschler <[email protected]>
+
+ Merge r168438
+
+ 2014-05-07 Brady Eidson <[email protected]>
+
+ Image menu is offset by the amount the view is scrolled
+ <rdar://problem/16818966> and https://bugs.webkit.org/show_bug.cgi?id=132663
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::showContextMenu): Use FrameView::contentsToWindow instead of contentsToRoot,
+ and skip the [NSView convertPoint:toView:] step.
+
2014-04-17 Lucas Forschler <[email protected]>
Merge r168565
Modified: branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (168751 => 168752)
--- branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-13 23:30:18 UTC (rev 168751)
+++ branches/safari-538.34-branch/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-13 23:34:33 UTC (rev 168752)
@@ -429,9 +429,8 @@
return;
NSView* view = frameView->documentView();
- IntPoint point = frameView->contentsToRootView(page->contextMenuController().hitTestResult().roundedPointInInnerNodeFrame());
- NSPoint nsScreenPoint = [view convertPoint:point toView:nil];
- NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:nsScreenPoint modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
+ IntPoint point = frameView->contentsToWindow(page->contextMenuController().hitTestResult().roundedPointInInnerNodeFrame());
+ NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:point modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
// Show the contextual menu for this event.
if (NSMenu *menu = contextMenuForEvent(event, view))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
