Title: [175326] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175326
- Author
- [email protected]
- Date
- 2014-10-29 01:59:31 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175256. rdar://problem/18798121
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175325 => 175326)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:57:06 UTC (rev 175325)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:59:31 UTC (rev 175326)
@@ -1,5 +1,20 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175256
+
+ 2014-10-28 Tim Horton <[email protected]>
+
+ Remove an inaccurate comment in WKActionMenuController
+ https://bugs.webkit.org/show_bug.cgi?id=138135
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForLink]):
+ The comment is wrong; the separator is there for spacing, not just as a workaround.
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175238
2014-10-27 Conrad Shultz <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175325 => 175326)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:57:06 UTC (rev 175325)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:59:31 UTC (rev 175326)
@@ -149,7 +149,6 @@
RetainPtr<NSMenuItem> previewLinkItem = [self _createActionMenuItemForTag:kWKContextActionItemTagPreviewLink];
RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:kWKContextActionItemTagAddLinkToSafariReadingList];
- // FIXME: The separator item is required to work around <rdar://18684207>.
return @[ openLinkItem.get(), previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
