Title: [191363] trunk/Source/WebKit2
- Revision
- 191363
- Author
- [email protected]
- Date
- 2015-10-20 16:15:57 -0700 (Tue, 20 Oct 2015)
Log Message
ASSERT when right clicking on SVG Image generating Share menu - can break Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=150374
Patch by Joseph Pecoraro <[email protected]> on 2015-10-20
Reviewed by Brian Burg.
When there is no absolute URL or downloadable media URL no system share
menu is created, but we were still appending the null context menu to
the list of context menu items.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::shareMenuItem):
Bail early if the context menu is null.
(WebKit::WebContextMenuProxyMac::showContextMenu):
Only append the share context menu item if it is non-null.
This matches ContextMenuController.cpp in WebCore.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191362 => 191363)
--- trunk/Source/WebKit2/ChangeLog 2015-10-20 22:49:15 UTC (rev 191362)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-20 23:15:57 UTC (rev 191363)
@@ -1,3 +1,22 @@
+2015-10-20 Joseph Pecoraro <[email protected]>
+
+ ASSERT when right clicking on SVG Image generating Share menu - can break Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=150374
+
+ Reviewed by Brian Burg.
+
+ When there is no absolute URL or downloadable media URL no system share
+ menu is created, but we were still appending the null context menu to
+ the list of context menu items.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::shareMenuItem):
+ Bail early if the context menu is null.
+
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ Only append the share context menu item if it is non-null.
+ This matches ContextMenuController.cpp in WebCore.
+
2015-10-20 Commit Queue <[email protected]>
Unreviewed, rolling out r191306.
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191362 => 191363)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-20 22:49:15 UTC (rev 191362)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-20 23:15:57 UTC (rev 191363)
@@ -341,6 +341,8 @@
image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), m_context.selectedText());
+ if (item.isNull())
+ return item;
NSMenuItem *nsItem = item.platformDescription();
@@ -397,7 +399,9 @@
}
#if ENABLE(SERVICE_CONTROLS)
- proposedAPIItems.append(WebContextMenuItem::create(shareMenuItem()));
+ ContextMenuItem shareItem = shareMenuItem();
+ if (!shareItem.isNull())
+ proposedAPIItems.append(WebContextMenuItem::create(shareItem));
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
