Title: [175316] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175316
- Author
- [email protected]
- Date
- 2014-10-29 01:33:49 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175179. rdar://problem/18758758
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175315 => 175316)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:30:49 UTC (rev 175315)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:33:49 UTC (rev 175316)
@@ -1,5 +1,20 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175179
+
+ 2014-10-24 Tim Horton <[email protected]>
+
+ [Mac][WebKit2] Move action menu code into its own file
+ https://bugs.webkit.org/show_bug.cgi?id=138034
+ <rdar://problem/18758758>
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController prepareForMenu:withEvent:]):
+ (-[WKActionMenuController _addImageToPhotos:]):
+ Review comments that were not previously addressed.
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175178
2014-10-24 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175315 => 175316)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:30:49 UTC (rev 175315)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:33:49 UTC (rev 175316)
@@ -106,7 +106,7 @@
[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 @@
- (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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
