From f06e4944c96133070c05df48b373b0202b64c688 Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Fri, 24 Oct 2014 21:13:14 +0000 Subject: [PATCH 1/1] [Mac][WebKit2] Move action menu code into its own file https://bugs.webkit.org/show_bug.cgi?id=138034 * UIProcess/mac/WKActionMenuController.mm: (-[WKActionMenuController prepareForMenu:withEvent:]): (-[WKActionMenuController _addImageToPhotos:]): Review comments that were not previously addressed. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175179 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 11 +++++++++++ .../WebKit2/UIProcess/mac/WKActionMenuController.mm | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 6552de281cb0..1fde49138433 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2014-10-24 Tim Horton + + [Mac][WebKit2] Move action menu code into its own file + https://bugs.webkit.org/show_bug.cgi?id=138034 + + + * UIProcess/mac/WKActionMenuController.mm: + (-[WKActionMenuController prepareForMenu:withEvent:]): + (-[WKActionMenuController _addImageToPhotos:]): + Review comments that were not previously addressed. + 2014-10-24 Tim Horton [Mac][WebKit2] Move action menu code into its own file diff --git a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm index a31f971eb9a6..00d68e9bf9e1 100644 --- a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm +++ b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm @@ -106,7 +106,7 @@ enum class ActionMenuState { [self _updateActionMenuItems]; - _page->performActionMenuHitTestAtLocation([_wkView convertPoint:[event locationInWindow] fromView:nil]); + _page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]); _state = ActionMenuState::Pending; } @@ -278,7 +278,7 @@ static NSString *pathToPhotoOnDisk(NSString *suggestedFilename) - (void)_addImageToPhotos:(id)sender { - // FIXME: We shouldn't even add the button if this is the case, for now. + // FIXME: We shouldn't even add the menu item if this is the case, for now. if (![getIKSlideshowClass() canExportToApplication:@"com.apple.Photos"]) return; -- 2.36.0