<!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>[189102] 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/189102">189102</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 10:35:07 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Right-clicking on GIFs spins the UI process for a while
https://bugs.webkit.org/show_bug.cgi?id=148566
<rdar://problem/22460854>
Reviewed by Brady Eidson.
* platform/ContextMenuItem.h:
Properly mark this as Mac-only. It's only implemented in ContextMenuItemMac.
* platform/mac/ContextMenuItemMac.mm:
(WebCore::ContextMenuItem::shareMenuItem):
Take a NSImage directly, so we don't have to round-trip through BitmapImage,
which can be lossy and expensive.
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::shareMenuItem):
Make an NSImage directly from the hit image if possible.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::platformInitializeShareMenuItem):
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::platformInitializeShareMenuItem):
Move all of the code to make a Share menuitem into platformInitializeShareMenuItem.
Make an NSImage directly from the image data if possible.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemcpp">trunk/Source/WebCore/platform/ContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemh">trunk/Source/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkContextMenuItemGtkcpp">trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacContextMenuItemMacmm">trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebCore/ChangeLog 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-28 Timothy Horton <timothy_horton@apple.com>
+
+ [Mac] Right-clicking on GIFs spins the UI process for a while
+ https://bugs.webkit.org/show_bug.cgi?id=148566
+ <rdar://problem/22460854>
+
+ Reviewed by Brady Eidson.
+
+ * platform/ContextMenuItem.h:
+ Properly mark this as Mac-only. It's only implemented in ContextMenuItemMac.
+
+ * platform/mac/ContextMenuItemMac.mm:
+ (WebCore::ContextMenuItem::shareMenuItem):
+ Take a NSImage directly, so we don't have to round-trip through BitmapImage,
+ which can be lossy and expensive.
+
</ins><span class="cx"> 2015-08-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Use new CFNetwork cookie jar SPI only on El Capitan.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.cpp (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.cpp 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebCore/platform/ContextMenuItem.cpp 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -131,11 +131,6 @@
</span><span class="cx"> return m_enabled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuItem ContextMenuItem::shareMenuItem(const URL&, const URL&, Image*, const String&)
-{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+OBJC_CLASS NSImage;
</ins><span class="cx"> OBJC_CLASS NSMenuItem;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef struct _GtkMenuItem GtkMenuItem;
</span><span class="lines">@@ -207,7 +208,9 @@
</span><span class="cx">
</span><span class="cx"> void setSubMenu(ContextMenu*);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static ContextMenuItem shareMenuItem(const URL& absoluteLinkURL, const URL& downloadableMediaURL, Image*, const String& selectedText);
</del><ins>+#if PLATFORM(MAC)
+ WEBCORE_EXPORT static ContextMenuItem shareMenuItem(const URL& absoluteLinkURL, const URL& downloadableMediaURL, NSImage *, const String& selectedText);
+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> GtkAction* gtkAction() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkContextMenuItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -288,11 +288,6 @@
</span><span class="cx"> return gtk_activatable_get_related_action(GTK_ACTIVATABLE(m_platformDescription));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuItem ContextMenuItem::shareMenuItem(const URL&, const URL&, Image*, const String&)
-{
- return ContextMenuItem();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacContextMenuItemMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> return [m_platformDescription.get() state] == NSOnState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuItem ContextMenuItem::shareMenuItem(const URL& absoluteLinkURL, const URL& downloadableMediaURL, Image* image, const String& selectedText)
</del><ins>+ContextMenuItem ContextMenuItem::shareMenuItem(const URL& absoluteLinkURL, const URL& downloadableMediaURL, NSImage *image, const String& selectedText)
</ins><span class="cx"> {
</span><span class="cx"> if (![[NSMenuItem class] respondsToSelector:@selector(standardShareMenuItemWithItems:)])
</span><span class="cx"> return ContextMenuItem();
</span><span class="lines">@@ -209,11 +209,8 @@
</span><span class="cx"> if (!downloadableMediaURL.isEmpty())
</span><span class="cx"> [items addObject:(NSURL *)downloadableMediaURL];
</span><span class="cx">
</span><del>- if (image) {
- NSImage *nsImage = image->getNSImage();
- if (nsImage)
- [items addObject:nsImage];
- }
</del><ins>+ if (image)
+ [items addObject:image];
</ins><span class="cx">
</span><span class="cx"> if (!selectedText.isEmpty())
</span><span class="cx"> [items addObject:(NSString *)selectedText];
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-28 Timothy Horton <timothy_horton@apple.com>
+
+ [Mac] Right-clicking on GIFs spins the UI process for a while
+ https://bugs.webkit.org/show_bug.cgi?id=148566
+ <rdar://problem/22460854>
+
+ Reviewed by Brady Eidson.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::shareMenuItem):
+ Make an NSImage directly from the hit image if possible.
+
</ins><span class="cx"> 2015-08-27 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Factor out Lookup invocation
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -387,7 +387,13 @@
</span><span class="cx"> if (!hitTestResult.absoluteMediaURL().isEmpty() && hitTestResult.isDownloadableMedia())
</span><span class="cx"> downloadableMediaURL = hitTestResult.absoluteMediaURL();
</span><span class="cx">
</span><del>- return ContextMenuItem::shareMenuItem(hitTestResult.absoluteLinkURL(), downloadableMediaURL, hitTestResult.image(), hitTestResult.selectedText());
</del><ins>+ RetainPtr<NSImage> nsImage;
+ if (Image* image = hitTestResult.image()) {
+ if (RefPtr<SharedBuffer> buffer = image->data())
+ nsImage = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:buffer->data() length:buffer->size()]]);
+ }
+
+ return ContextMenuItem::shareMenuItem(hitTestResult.absoluteLinkURL(), downloadableMediaURL, nsImage.get(), hitTestResult.selectedText());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebContextMenuClient::clientFloatRectForNode(Node& node, FloatRect& rect) const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-28 Timothy Horton <timothy_horton@apple.com>
+
+ [Mac] Right-clicking on GIFs spins the UI process for a while
+ https://bugs.webkit.org/show_bug.cgi?id=148566
+ <rdar://problem/22460854>
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::platformInitializeShareMenuItem):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::platformInitializeShareMenuItem):
+ Move all of the code to make a Share menuitem into platformInitializeShareMenuItem.
+ Make an NSImage directly from the image data if possible.
+
</ins><span class="cx"> 2015-08-28 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] LIBSECCOMP_INCLUDE_DIRS should be added to WebKit2_SYSTEM_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -4259,27 +4259,9 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Create the real Share menu item
- URL absoluteLinkURL;
- if (!contextMenuContextData.webHitTestResultData().absoluteLinkURL.isEmpty())
- absoluteLinkURL = URL(ParsedURLString, contextMenuContextData.webHitTestResultData().absoluteLinkURL);
-
- URL downloadableMediaURL;
- if (!contextMenuContextData.webHitTestResultData().absoluteMediaURL.isEmpty() && contextMenuContextData.webHitTestResultData().isDownloadableMedia)
- downloadableMediaURL = URL(ParsedURLString, contextMenuContextData.webHitTestResultData().absoluteMediaURL);
-
- RefPtr<Image> image;
- if (contextMenuContextData.webHitTestResultData().imageSharedMemory && contextMenuContextData.webHitTestResultData().imageSize) {
- image = BitmapImage::create();
- RefPtr<SharedBuffer> imageData = SharedBuffer::create((unsigned char*)contextMenuContextData.webHitTestResultData().imageSharedMemory->data(), contextMenuContextData.webHitTestResultData().imageSize);
- image->setData(imageData.release(), true);
- }
-
- ContextMenuItem coreItem = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), contextMenuContextData.selectedText());
- if (!coreItem.isNull()) {
- platformInitializeShareMenuItem(coreItem);
</del><ins>+ ContextMenuItem coreItem = platformInitializeShareMenuItem(contextMenuContextData);
+ if (!coreItem.isNull())
</ins><span class="cx"> proposedAPIItems.append(WebContextMenuItem::create(coreItem));
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> clientItems;
</span><span class="lines">@@ -4295,9 +4277,10 @@
</span><span class="cx"> m_contextMenuClient->contextMenuDismissed(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
-void WebPageProxy::platformInitializeShareMenuItem(ContextMenuItem&)
</del><ins>+#if !ENABLE(SERVICE_CONTROLS)
+ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData&)
</ins><span class="cx"> {
</span><ins>+ return ContextMenuItem();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -1265,8 +1265,7 @@
</span><span class="cx"> };
</span><span class="cx"> void showContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, const UserData&);
</span><span class="cx"> void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, ContextMenuClientEligibility, const UserData&);
</span><del>-
- void platformInitializeShareMenuItem(WebCore::ContextMenuItem&);
</del><ins>+ WebCore::ContextMenuItem platformInitializeShareMenuItem(const ContextMenuContextData&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (189101 => 189102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-08-28 17:14:11 UTC (rev 189101)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-08-28 17:35:07 UTC (rev 189102)
</span><span class="lines">@@ -748,9 +748,25 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::platformInitializeShareMenuItem(ContextMenuItem& item)
</del><ins>+#if ENABLE(SERVICE_CONTROLS)
+ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData& contextMenuContextData)
</ins><span class="cx"> {
</span><del>-#if ENABLE(SERVICE_CONTROLS)
</del><ins>+ const WebHitTestResult::Data& hitTestData = contextMenuContextData.webHitTestResultData();
+
+ URL absoluteLinkURL;
+ if (!hitTestData.absoluteLinkURL.isEmpty())
+ absoluteLinkURL = URL(ParsedURLString, hitTestData.absoluteLinkURL);
+
+ URL downloadableMediaURL;
+ if (!hitTestData.absoluteMediaURL.isEmpty() && hitTestData.isDownloadableMedia)
+ downloadableMediaURL = URL(ParsedURLString, hitTestData.absoluteMediaURL);
+
+ RetainPtr<NSImage> image;
+ if (hitTestData.imageSharedMemory && hitTestData.imageSize)
+ image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
+
+ ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), contextMenuContextData.selectedText());
+
</ins><span class="cx"> NSMenuItem *nsItem = item.platformDescription();
</span><span class="cx">
</span><span class="cx"> NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
</span><span class="lines">@@ -762,9 +778,11 @@
</span><span class="cx">
</span><span class="cx"> // Setting the picker lets the delegate retain it to keep it alive, but this picker is kept alive by the menu item.
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nil];
</span><ins>+
+ return item;
+}
</ins><span class="cx"> #endif
</span><del>-}
-
</del><ins>+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>