Title: [175303] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 175303
- Author
- [email protected]
- Date
- 2014-10-28 21:28:57 -0700 (Tue, 28 Oct 2014)
Log Message
Merge r174837. <rdar://problem/18753175>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175302 => 175303)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:24:27 UTC (rev 175302)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 04:28:57 UTC (rev 175303)
@@ -1,5 +1,16 @@
2014-10-28 Dana Burkart <[email protected]>
+ Merge r174837. <rdar://problem/18753175>
+
+ 2014-10-17 Tim Horton <[email protected]>
+
+ Fix the build with the public SDK.
+
+ * WebCoreSupport/WebSelectionServiceController.mm:
+ We should transition all this SPI to real SPI headers as soon as possible.
+
+2014-10-28 Dana Burkart <[email protected]>
+
Merge r174791. <rdar://problem/18753175>
2014-10-16 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm (175302 => 175303)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-29 04:24:27 UTC (rev 175302)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2014-10-29 04:28:57 UTC (rev 175303)
@@ -38,14 +38,19 @@
#if __has_include(<AppKit/NSSharingService_Private.h>)
#import <AppKit/NSSharingService_Private.h>
#else
-typedef NS_ENUM(NSInteger, NSSharingServicePickerStyle) {
- NSSharingServicePickerStyleMenu = 0,
- NSSharingServicePickerStyleRollover = 1,
- NSSharingServicePickerStyleTextSelection = 2,
- NSSharingServicePickerStyleDataDetector = 3
+typedef NS_OPTIONS(NSUInteger, NSSharingServiceMask) {
+ NSSharingServiceMaskShare = (1 << NSSharingServiceTypeShare),
+ NSSharingServiceMaskViewer = (1 << NSSharingServiceTypeViewer),
+ NSSharingServiceMaskEditor = (1 << NSSharingServiceTypeEditor),
+
+ NSSharingServiceMaskAllTypes = 0xFFFF
} NS_ENUM_AVAILABLE_MAC(10_10);
#endif
+@interface NSSharingService (WKDetails)
++ (NSArray *)sharingServicesForItems:(NSArray *)items mask:(NSSharingServiceMask)maskForFiltering;
+@end
+
WebSelectionServiceController::WebSelectionServiceController(WebView *webView)
: m_webView(webView)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
