Title: [191469] trunk/Source/WebKit2
- Revision
- 191469
- Author
- ander...@apple.com
- Date
- 2015-10-22 13:28:13 -0700 (Thu, 22 Oct 2015)
Log Message
Handle nil menu items.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItemVector):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191468 => 191469)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 20:13:54 UTC (rev 191468)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 20:28:13 UTC (rev 191469)
@@ -1,5 +1,12 @@
2015-10-22 Anders Carlsson <ander...@apple.com>
+ Handle nil menu items.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::nsMenuItemVector):
+
+2015-10-22 Anders Carlsson <ander...@apple.com>
+
Wait to convert the share menu item to a real share menu until after calling out to the client
https://bugs.webkit.org/show_bug.cgi?id=150465
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191468 => 191469)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 20:13:54 UTC (rev 191468)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 20:28:13 UTC (rev 191469)
@@ -242,8 +242,10 @@
unsigned size = items.size();
result.reserveCapacity(size);
- for (auto& item : items)
- result.uncheckedAppend(nsMenuItem(contextMenuProxy, item));
+ for (auto& item : items) {
+ if (auto menuItem = nsMenuItem(contextMenuProxy, item))
+ result.uncheckedAppend(menuItem);
+ }
WKMenuTarget* target = [WKMenuTarget sharedMenuTarget];
for (auto& item : result)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
