Title: [175325] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175325
- Author
- [email protected]
- Date
- 2014-10-29 01:57:06 -0700 (Wed, 29 Oct 2014)
Log Message
Merged r175238. rdar://problem/18797743
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175324 => 175325)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:54:22 UTC (rev 175324)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 08:57:06 UTC (rev 175325)
@@ -1,5 +1,20 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Merge r175238
+
+ 2014-10-27 Conrad Shultz <[email protected]>
+
+ NSSharingService protocol conformance should be internal to WKActionMenuController
+ https://bugs.webkit.org/show_bug.cgi?id=138112
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ Move protocol conformance from the interface to a class extension.
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175193
2014-10-24 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175324 => 175325)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:54:22 UTC (rev 175324)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-10-29 08:57:06 UTC (rev 175325)
@@ -44,7 +44,7 @@
@class WKView;
-@interface WKActionMenuController : NSObject <NSSharingServiceDelegate, NSSharingServicePickerDelegate> {
+@interface WKActionMenuController : NSObject {
@private
WebKit::WebPageProxy *_page;
WKView *_wkView;
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175324 => 175325)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:54:22 UTC (rev 175324)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 08:57:06 UTC (rev 175325)
@@ -59,7 +59,7 @@
using namespace WebCore;
using namespace WebKit;
-@interface WKActionMenuController ()
+@interface WKActionMenuController () <NSSharingServiceDelegate, NSSharingServicePickerDelegate>
- (void)_updateActionMenuItems;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
