<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168145] trunk/Source/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168145">168145</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 20:31:43 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update service picker API usage.
<rdar://problem/16772674> and https://bugs.webkit.org/show_bug.cgi?id=132452
Reviewed by Tim Horton.
* Misc/WebSharingServicePickerController.h:
* Misc/WebSharingServicePickerController.mm:
(-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):
Factor out a common "didShare" handler that optionally validates whether the data represents an image.
(-[WebSharingServicePickerController sharingService:didShareItems:]): Update API usage, including marshalling
on off-main thread call back to the main thread.
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::contextMenuForEvent): Update API usage.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllerh">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllermm">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168144 => 168145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-02 02:28:49 UTC (rev 168144)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-02 03:31:43 UTC (rev 168145)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-01 Brady Eidson <beidson@apple.com>
+
+ Update service picker API usage.
+ <rdar://problem/16772674> and https://bugs.webkit.org/show_bug.cgi?id=132452
+
+ Reviewed by Tim Horton.
+
+ * Misc/WebSharingServicePickerController.h:
+ * Misc/WebSharingServicePickerController.mm:
+ (-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):
+ Factor out a common "didShare" handler that optionally validates whether the data represents an image.
+ (-[WebSharingServicePickerController sharingService:didShareItems:]): Update API usage, including marshalling
+ on off-main thread call back to the main thread.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::contextMenuForEvent): Update API usage.
+
</ins><span class="cx"> 2014-05-01 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Support OS-version-specific install paths for WebKit.framework
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h (168144 => 168145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2014-05-02 02:28:49 UTC (rev 168144)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2014-05-02 03:31:43 UTC (rev 168145)
</span><span class="lines">@@ -39,8 +39,9 @@
</span><span class="cx"> BOOL _includeEditorServices;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)initWithImage:(NSImage *)image includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient;
</del><ins>+- (instancetype)initWithData:(NSData *)data includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient;
</ins><span class="cx"> - (NSMenu *)menu;
</span><ins>+- (void)didShareImageData:(NSData *)data confirmDataIsValidTIFFData:(BOOL)confirmData;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (168144 => 168145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-05-02 02:28:49 UTC (rev 168144)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-05-02 03:31:43 UTC (rev 168145)
</span><span class="lines">@@ -49,7 +49,16 @@
</span><span class="cx"> @property NSSharingServicePickerStyle style;
</span><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if __has_include(<AppKit/NSItemProvider.h>)
+#import <AppKit/NSItemProvider.h>
+#else
+@interface NSItemProvider : NSObject
+@property (copy, readonly) NSArray *registeredTypeIdentifiers;
+- (instancetype)initWithItem:(id <NSSecureCoding>)item typeIdentifier:(NSString *)typeIdentifier;
+- (void)loadItemForTypeIdentifier:(NSString *)typeIdentifier options:(NSDictionary *)options completionHandler:(void (^)(id <NSSecureCoding> item, NSError *error))completionHandler;
+@end
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static NSString *serviceControlsPasteboardName = @"WebKitServiceControlsPasteboard";
</span><span class="lines">@@ -58,12 +67,14 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebSharingServicePickerController
</span><span class="cx">
</span><del>-- (instancetype)initWithImage:(NSImage *)image includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient
</del><ins>+- (instancetype)initWithData:(NSData *)data includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient
</ins><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ image ]]);
</del><ins>+ RetainPtr<NSItemProvider> itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:data typeIdentifier:@"public.data"]);
+
+ _picker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ itemProvider.get() ]]);
</ins><span class="cx"> [_picker setStyle:NSSharingServicePickerStyleRollover];
</span><span class="cx"> [_picker setDelegate:self];
</span><span class="cx">
</span><span class="lines">@@ -86,9 +97,35 @@
</span><span class="cx"> return [_picker menu];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)didShareImageData:(NSData *)data confirmDataIsValidTIFFData:(BOOL)confirmData
+{
+ Page* page = [_menuClient->webView() page];
+ if (!page)
+ return;
+
+ if (confirmData) {
+ RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithData:data]);
+ if (!nsImage) {
+ LOG_ERROR("Shared image data cannot create a valid NSImage");
+ return;
+ }
+
+ data = [nsImage TIFFRepresentation];
+ }
+
+ NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:serviceControlsPasteboardName];
+ [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
+ [pasteboard setData:data forType:NSPasteboardTypeTIFF];
+
+ Frame& frame = page->focusController().focusedOrMainFrame();
+ if (!frame.selection().isNone())
+ frame.editor().readSelectionFromPasteboard(serviceControlsPasteboardName);
+
+ [self clear];
+}
+
</ins><span class="cx"> #pragma mark NSSharingServicePickerDelegate methods
</span><span class="cx">
</span><del>-
</del><span class="cx"> - (NSArray *)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker sharingServicesForItems:(NSArray *)items mask:(NSSharingServiceMask)mask proposedSharingServices:(NSArray *)proposedServices
</span><span class="cx"> {
</span><span class="cx"> if (_includeEditorServices)
</span><span class="lines">@@ -123,25 +160,32 @@
</span><span class="cx"> if ([items count] != 1)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CGImageSourceRef> source = adoptCF(CGImageSourceCreateWithData((CFDataRef)[items objectAtIndex:0], NULL));
- RetainPtr<CGImageRef> cgImage = adoptCF(CGImageSourceCreateImageAtIndex(source.get(), 0, NULL));
</del><ins>+ id item = [items objectAtIndex:0];
</ins><span class="cx">
</span><del>- if (!cgImage)
- return;
</del><ins>+ if ([item isKindOfClass:[NSImage class]])
+ [self didShareImageData:[item TIFFRepresentation] confirmDataIsValidTIFFData:NO];
+ else if ([item isKindOfClass:[NSItemProvider class]]) {
+ NSItemProvider *itemProvider = (NSItemProvider *)item;
+ NSString *itemUTI = itemProvider.registeredTypeIdentifiers.firstObject;
+
+ [itemProvider loadItemForTypeIdentifier:itemUTI options:nil completionHandler:^(id receivedData, NSError *dataError) {
+ if (!receivedData) {
+ LOG_ERROR("Did not receive data from NSItemProvider");
+ return;
+ }
</ins><span class="cx">
</span><del>- Page* page = [_menuClient->webView() page];
- if (!page)
- return;
</del><ins>+ if (![receivedData isKindOfClass:[NSData class]]) {
+ LOG_ERROR("Data received from NSItemProvider is not of type NSData");
+ return;
+ }
</ins><span class="cx">
</span><del>- NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:serviceControlsPasteboardName];
- [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
- [pasteboard setData:[items objectAtIndex:0] forType:NSPasteboardTypeTIFF];
</del><ins>+ [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+ [self didShareImageData:receivedData confirmDataIsValidTIFFData:YES];
+ }];
</ins><span class="cx">
</span><del>- Frame& frame = page->focusController().focusedOrMainFrame();
- if (!frame.selection().isNone())
- frame.editor().readSelectionFromPasteboard(serviceControlsPasteboardName);
-
- [self clear];
</del><ins>+ }];
+ } else
+ LOG_ERROR("sharingService:didShareItems: - Unknown item type returned");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)sharingService:(NSSharingService *)sharingService didFailToShareItems:(NSArray *)items error:(NSError *)error
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (168144 => 168145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-02 02:28:49 UTC (rev 168144)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-02 03:31:43 UTC (rev 168145)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><ins>+#import <WebCore/SharedBuffer.h>
</ins><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="lines">@@ -363,8 +364,13 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> if (Image* image = page->contextMenuController().context().controlledImage()) {
</span><span class="cx"> ASSERT(page->contextMenuController().context().hitTestResult().innerNode());
</span><ins>+
+ RefPtr<SharedBuffer> data = image->data();
+ ASSERT(data);
+ RetainPtr<CFDataRef> cfData = data->createCFData();
+
</ins><span class="cx"> bool isContentEditable = page->contextMenuController().context().hitTestResult().innerNode()->isContentEditable();
</span><del>- m_sharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithImage:image->getNSImage() includeEditorServices:isContentEditable menuClient:this]);
</del><ins>+ m_sharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithData:(NSData *)cfData.get() includeEditorServices:isContentEditable menuClient:this]);
</ins><span class="cx">
</span><span class="cx"> return [m_sharingServicePickerController menu];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>