<!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>[176288] trunk/Source</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/176288">176288</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-11-18 14:54:52 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid re-encoding action menu image data
https://bugs.webkit.org/show_bug.cgi?id=138817
<rdar://problem/18840382>
Reviewed by Anders Carlsson.
* Shared/mac/ActionMenuHitTestResult.h:
* Shared/mac/ActionMenuHitTestResult.mm:
(WebKit::ActionMenuHitTestResult::encode):
(WebKit::ActionMenuHitTestResult::decode):
Store and encode a SharedMemory with the raw encoded image data,
instead of re-painting the image into a ShareableBitmap.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _hitTestResultImage]):
(-[WKActionMenuController _defaultMenuItemsForImage]):
(-[WKActionMenuController _copyImage:]):
(-[WKActionMenuController _addImageToPhotos:]):
(-[WKActionMenuController _defaultMenuItems]):
(-[WKActionMenuController _canAddMediaToPhotos]): Deleted.
Build a temporary filename from a UUID and the image's desired extension.
Use the Image's encoded data instead of re-encoding it with CGImageDestination.
Build an image menu only if we have an image, URL, data, and extension.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performActionMenuHitTestAtLocation):
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForImage:]):
(-[WebActionMenuController _addImageToPhotos:]):
Build a temporary filename from a UUID and the image's desired extension.
Use the Image's encoded data instead of re-encoding it with CGImageDestination.
Build an image menu only if we have an image, URL, data, and extension.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacActionMenuHitTestResulth">trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacActionMenuHitTestResultmm">trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.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 (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-18 Tim Horton <timothy_horton@apple.com>
+
+ Avoid re-encoding action menu image data
+ https://bugs.webkit.org/show_bug.cgi?id=138817
+ <rdar://problem/18840382>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForImage:]):
+ (-[WebActionMenuController _addImageToPhotos:]):
+ Build a temporary filename from a UUID and the image's desired extension.
+ Use the Image's encoded data instead of re-encoding it with CGImageDestination.
+ Build an image menu only if we have an image, URL, data, and extension.
+
</ins><span class="cx"> 2014-11-18 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Libdispatch, Dyld, IOKit, Mach, NSPointerFunctions, MobileGestalt
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -38,9 +38,11 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <ImageIO/ImageIO.h>
</span><span class="cx"> #import <ImageKit/ImageKit.h>
</span><ins>+#import <WebCore/ArchiveResource.h>
</ins><span class="cx"> #import <WebCore/DataDetection.h>
</span><span class="cx"> #import <WebCore/DataDetectorsSPI.h>
</span><span class="cx"> #import <WebCore/DictionaryLookup.h>
</span><ins>+#import <WebCore/DocumentLoader.h>
</ins><span class="cx"> #import <WebCore/Editor.h>
</span><span class="cx"> #import <WebCore/Element.h>
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="lines">@@ -56,6 +58,7 @@
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderElement.h>
</span><span class="cx"> #import <WebCore/RenderObject.h>
</span><ins>+#import <WebCore/SharedBuffer.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/TextCheckerClient.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="lines">@@ -328,11 +331,15 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareImage];
</span><span class="cx"> if (Image* image = _hitTestResult.image()) {
</span><del>- RetainPtr<CGImageRef> cgImage = image->getCGImageRef();
- RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithCGImage:cgImage.get() size:NSZeroSize]);
- _sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ nsImage.get() ]]);
- [_sharingServicePicker setDelegate:self];
- [shareItem setSubmenu:[_sharingServicePicker menu]];
</del><ins>+ RefPtr<SharedBuffer> buffer = image->data();
+ if (buffer) {
+ RetainPtr<NSData> nsData = [NSData dataWithBytes:buffer->data() length:buffer->size()];
+ RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithData:nsData.get()]);
+ _sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ nsImage.get() ]]);
+ [_sharingServicePicker setDelegate:self];
+ [shareItem setSubmenu:[_sharingServicePicker menu]];
+ } else
+ [shareItem setEnabled:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return @[ copyImageItem.get(), addToPhotosItem.get(), saveToDownloadsItem.get(), shareItem.get() ];
</span><span class="lines">@@ -404,19 +411,23 @@
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> cgImage = image->getCGImageRef();
</del><ins>+ String imageExtension = image->filenameExtension();
+ if (imageExtension.isEmpty())
+ return;
</ins><span class="cx">
</span><ins>+ RefPtr<SharedBuffer> buffer = image->data();
+ if (!buffer)
+ return;
+ RetainPtr<NSData> nsData = [NSData dataWithBytes:buffer->data() length:buffer->size()];
+ RetainPtr<NSString> suggestedFilename = [[[NSProcessInfo processInfo] globallyUniqueString] stringByAppendingPathExtension:imageExtension];
+
</ins><span class="cx"> dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
</span><del>- NSString * const suggestedFilename = @"image.jpg";
-
- NSString *filePath = pathToPhotoOnDisk(suggestedFilename);
</del><ins>+ NSString *filePath = pathToPhotoOnDisk(suggestedFilename.get());
</ins><span class="cx"> if (!filePath)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSURL *fileURL = [NSURL fileURLWithPath:filePath];
</span><del>- auto dest = adoptCF(CGImageDestinationCreateWithURL((CFURLRef)fileURL, kUTTypeJPEG, 1, nullptr));
- CGImageDestinationAddImage(dest.get(), cgImage.get(), nullptr);
- CGImageDestinationFinalize(dest.get());
</del><ins>+ [nsData writeToURL:fileURL atomically:NO];
</ins><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> // This API provides no way to report failure, but if 18420778 is fixed so that it does, we should handle this.
</span><span class="lines">@@ -832,7 +843,8 @@
</span><span class="cx"> return [self _defaultMenuItemsForVideo];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (_hitTestResult.image() && !_hitTestResult.absoluteImageURL().isEmpty()) {
</del><ins>+ Image* image = _hitTestResult.image();
+ if (image && !_hitTestResult.absoluteImageURL().isEmpty() && !image->filenameExtension().isEmpty() && image->data() && !image->data()->isEmpty()) {
</ins><span class="cx"> _type = WebActionMenuImage;
</span><span class="cx"> return [self _defaultMenuItemsForImage];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-18 Tim Horton <timothy_horton@apple.com>
+
+ Avoid re-encoding action menu image data
+ https://bugs.webkit.org/show_bug.cgi?id=138817
+ <rdar://problem/18840382>
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/mac/ActionMenuHitTestResult.h:
+ * Shared/mac/ActionMenuHitTestResult.mm:
+ (WebKit::ActionMenuHitTestResult::encode):
+ (WebKit::ActionMenuHitTestResult::decode):
+ Store and encode a SharedMemory with the raw encoded image data,
+ instead of re-painting the image into a ShareableBitmap.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _hitTestResultImage]):
+ (-[WKActionMenuController _defaultMenuItemsForImage]):
+ (-[WKActionMenuController _copyImage:]):
+ (-[WKActionMenuController _addImageToPhotos:]):
+ (-[WKActionMenuController _defaultMenuItems]):
+ (-[WKActionMenuController _canAddMediaToPhotos]): Deleted.
+ Build a temporary filename from a UUID and the image's desired extension.
+ Use the Image's encoded data instead of re-encoding it with CGImageDestination.
+ Build an image menu only if we have an image, URL, data, and extension.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+
</ins><span class="cx"> 2014-11-18 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] allow host application to opt-out of alternate fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacActionMenuHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> #ifndef ActionMenuHitTestResult_h
</span><span class="cx"> #define ActionMenuHitTestResult_h
</span><span class="cx">
</span><ins>+#include "DataReference.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><ins>+#include "SharedMemory.h"
</ins><span class="cx"> #include "TextIndicator.h"
</span><span class="cx"> #include "WebHitTestResult.h"
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="lines">@@ -50,7 +52,8 @@
</span><span class="cx"> WebHitTestResult::Data hitTestResult;
</span><span class="cx">
</span><span class="cx"> String lookupText;
</span><del>- RefPtr<ShareableBitmap> image;
</del><ins>+ RefPtr<SharedMemory> imageSharedMemory;
+ String imageExtension;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> actionContext;
</span><span class="cx"> WebCore::FloatRect detectedDataBoundingBox;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacActionMenuHitTestResultmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -42,15 +42,13 @@
</span><span class="cx"> encoder << hitTestLocationInViewCooordinates;
</span><span class="cx"> encoder << hitTestResult;
</span><span class="cx"> encoder << lookupText;
</span><ins>+ encoder << imageExtension;
</ins><span class="cx">
</span><del>- ShareableBitmap::Handle handle;
</del><ins>+ SharedMemory::Handle imageHandle;
+ if (imageSharedMemory && imageSharedMemory->size())
+ imageSharedMemory->createHandle(imageHandle, SharedMemory::ReadOnly);
+ encoder << imageHandle;
</ins><span class="cx">
</span><del>- // FIXME: We should consider sharing the raw original resource data so that metadata and whatnot are preserved.
- if (image)
- image->createHandle(handle, SharedMemory::ReadOnly);
-
- encoder << handle;
-
</del><span class="cx"> bool hasActionContext = actionContext;
</span><span class="cx"> encoder << hasActionContext;
</span><span class="cx"> if (hasActionContext) {
</span><span class="lines">@@ -82,13 +80,16 @@
</span><span class="cx"> if (!decoder.decode(actionMenuHitTestResult.lookupText))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ShareableBitmap::Handle handle;
- if (!decoder.decode(handle))
</del><ins>+ if (!decoder.decode(actionMenuHitTestResult.imageExtension))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!handle.isNull())
- actionMenuHitTestResult.image = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
</del><ins>+ SharedMemory::Handle imageHandle;
+ if (!decoder.decode(imageHandle))
+ return false;
</ins><span class="cx">
</span><ins>+ if (!imageHandle.isNull())
+ actionMenuHitTestResult.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
+
</ins><span class="cx"> bool hasActionContext;
</span><span class="cx"> if (!decoder.decode(hasActionContext))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -458,6 +458,16 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Image actions
</span><span class="cx">
</span><ins>+- (NSImage *)_hitTestResultImage
+{
+ RefPtr<SharedMemory> imageSharedMemory = _hitTestResult.imageSharedMemory;
+ if (!imageSharedMemory)
+ return nil;
+
+ RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:imageSharedMemory->data() length:imageSharedMemory->size()]]);
+ return nsImage.autorelease();
+}
+
</ins><span class="cx"> - (NSArray *)_defaultMenuItemsForImage
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMenuItem> copyImageItem = [self _createActionMenuItemForTag:kWKContextActionItemTagCopyImage];
</span><span class="lines">@@ -469,10 +479,8 @@
</span><span class="cx"> RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:kWKContextActionItemTagSaveImageToDownloads];
</span><span class="cx"> RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:kWKContextActionItemTagShareImage];
</span><span class="cx">
</span><del>- if (RefPtr<ShareableBitmap> bitmap = _hitTestResult.image) {
- RetainPtr<CGImageRef> image = bitmap->makeCGImage();
- RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithCGImage:image.get() size:NSZeroSize]);
- _sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ nsImage.get() ]]);
</del><ins>+ if (RetainPtr<NSImage> image = [self _hitTestResultImage]) {
+ _sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:@[ image.get() ]]);
</ins><span class="cx"> [_sharingServicePicker setDelegate:self];
</span><span class="cx"> [shareItem setSubmenu:[_sharingServicePicker menu]];
</span><span class="cx"> }
</span><span class="lines">@@ -482,14 +490,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)_copyImage:(id)sender
</span><span class="cx"> {
</span><del>- RefPtr<ShareableBitmap> bitmap = _hitTestResult.image;
- if (!bitmap)
</del><ins>+ RetainPtr<NSImage> image = [self _hitTestResultImage];
+ if (!image)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> image = bitmap->makeCGImage();
- RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithCGImage:image.get() size:NSZeroSize]);
</del><span class="cx"> [[NSPasteboard generalPasteboard] clearContents];
</span><del>- [[NSPasteboard generalPasteboard] writeObjects:@[ nsImage.get() ]];
</del><ins>+ [[NSPasteboard generalPasteboard] writeObjects:@[ image.get() ]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_saveImageToDownloads:(id)sender
</span><span class="lines">@@ -553,22 +559,20 @@
</span><span class="cx"> if (![self _canAddMediaToPhotos])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<ShareableBitmap> bitmap = _hitTestResult.image;
- if (!bitmap)
</del><ins>+ RefPtr<SharedMemory> imageSharedMemory = _hitTestResult.imageSharedMemory;
+ if (!imageSharedMemory->size() || _hitTestResult.imageExtension.isEmpty())
</ins><span class="cx"> return;
</span><del>- RetainPtr<CGImageRef> image = bitmap->makeCGImage();
</del><span class="cx">
</span><ins>+ RetainPtr<NSData> imageData = adoptNS([[NSData alloc] initWithBytes:imageSharedMemory->data() length:imageSharedMemory->size()]);
+ RetainPtr<NSString> suggestedFilename = [[[NSProcessInfo processInfo] globallyUniqueString] stringByAppendingPathExtension:_hitTestResult.imageExtension];
+
</ins><span class="cx"> dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
</span><del>- NSString * const suggestedFilename = @"image.jpg";
-
- NSString *filePath = pathToPhotoOnDisk(suggestedFilename);
</del><ins>+ NSString *filePath = pathToPhotoOnDisk(suggestedFilename.get());
</ins><span class="cx"> if (!filePath)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSURL *fileURL = [NSURL fileURLWithPath:filePath];
</span><del>- auto dest = adoptCF(CGImageDestinationCreateWithURL((CFURLRef)fileURL, kUTTypeJPEG, 1, nullptr));
- CGImageDestinationAddImage(dest.get(), image.get(), nullptr);
- CGImageDestinationFinalize(dest.get());
</del><ins>+ [imageData writeToURL:fileURL atomically:NO];
</ins><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> // This API provides no way to report failure, but if 18420778 is fixed so that it does, we should handle this.
</span><span class="lines">@@ -909,7 +913,7 @@
</span><span class="cx"> return [self _defaultMenuItemsForVideo];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.image) {
</del><ins>+ if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.imageSharedMemory && !_hitTestResult.imageExtension.isEmpty()) {
</ins><span class="cx"> _type = kWKActionMenuImage;
</span><span class="cx"> return [self _defaultMenuItemsForImage];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (176287 => 176288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-18 22:51:42 UTC (rev 176287)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-18 22:54:52 UTC (rev 176288)
</span><span class="lines">@@ -1009,9 +1009,13 @@
</span><span class="cx"> m_lastActionMenuHitTestResult = hitTestResult;
</span><span class="cx">
</span><span class="cx"> if (Image* image = hitTestResult.image()) {
</span><del>- actionMenuResult.image = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
- if (actionMenuResult.image)
- actionMenuResult.image->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ RefPtr<SharedBuffer> buffer = image->data();
+ String imageExtension = image->filenameExtension();
+ if (!imageExtension.isEmpty() && buffer) {
+ actionMenuResult.imageSharedMemory = SharedMemory::create(buffer->size());
+ memcpy(actionMenuResult.imageSharedMemory->data(), buffer->data(), buffer->size());
+ actionMenuResult.imageExtension = imageExtension;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool pageOverlayDidOverrideDataDetectors = false;
</span></span></pre>
</div>
</div>
</body>
</html>