Title: [191512] trunk
- Revision
- 191512
- Author
- [email protected]
- Date
- 2015-10-23 14:34:27 -0700 (Fri, 23 Oct 2015)
Log Message
Simplify the WebKitLegacy menu conversion code
https://bugs.webkit.org/show_bug.cgi?id=150509
Reviewed by Andreas Kling.
Source/WebKit/mac:
* WebCoreSupport/WebContextMenuClient.mm:
(fixMenusToSendToOldClients):
(fixMenusReceivedFromOldClients):
(WebContextMenuClient::getCustomMenuFromDefaultItems):
Tools:
Implement the context menu delegate method so we'll test that code path.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (191511 => 191512)
--- trunk/Source/WebKit/mac/ChangeLog 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-23 21:34:27 UTC (rev 191512)
@@ -1,5 +1,17 @@
2015-10-23 Anders Carlsson <[email protected]>
+ Simplify the WebKitLegacy menu conversion code
+ https://bugs.webkit.org/show_bug.cgi?id=150509
+
+ Reviewed by Andreas Kling.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (fixMenusToSendToOldClients):
+ (fixMenusReceivedFromOldClients):
+ (WebContextMenuClient::getCustomMenuFromDefaultItems):
+
+2015-10-23 Anders Carlsson <[email protected]>
+
Don't override already existing represented objects on menu items
https://bugs.webkit.org/show_bug.cgi?id=150508
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (191511 => 191512)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-23 21:34:27 UTC (rev 191512)
@@ -101,9 +101,9 @@
return preInspectElementTagClient;
}
-static NSMutableArray *fixMenusToSendToOldClients(NSMutableArray *defaultMenuItems)
+static RetainPtr<NSArray> fixMenusToSendToOldClients(NSMutableArray *defaultMenuItems)
{
- NSMutableArray *savedItems = nil;
+ auto savedItems = adoptNS([[NSMutableArray alloc] init]);
unsigned defaultItemsCount = [defaultMenuItems count];
@@ -112,7 +112,7 @@
NSMenuItem *lastItem = [defaultMenuItems objectAtIndex:defaultItemsCount - 1];
if ([secondToLastItem isSeparatorItem] && [lastItem tag] == WebMenuItemTagInspectElement) {
- savedItems = [NSMutableArray arrayWithCapacity:2];
+ savedItems = adoptNS([[NSMutableArray alloc] initWithCapacity:2]);
[savedItems addObject:secondToLastItem];
[savedItems addObject:lastItem];
@@ -125,10 +125,9 @@
BOOL preVersion3Client = isPreVersion3Client();
if (!preVersion3Client)
return savedItems;
-
- for (unsigned i = 0; i < defaultItemsCount; ++i) {
- NSMenuItem *item = [defaultMenuItems objectAtIndex:i];
- int tag = [item tag];
+
+ for (NSMenuItem *item in defaultMenuItems) {
+ int tag = item.tag;
int oldStyleTag = tag;
if (tag >= WEBMENUITEMTAG_WEBKIT_3_0_SPI_START) {
@@ -158,21 +157,23 @@
}
}
- if (oldStyleTag != tag)
- [item setTag:oldStyleTag];
+ item.tag = oldStyleTag;
}
return savedItems;
}
-static void fixMenusReceivedFromOldClients(NSMutableArray *newMenuItems, NSMutableArray *savedItems)
-{
+// FIXME: This should return NSArray.
+static RetainPtr<NSMutableArray> fixMenusReceivedFromOldClients(NSArray *delegateSuppliedItems, NSArray *savedItems)
+{
+ auto newMenuItems = adoptNS([delegateSuppliedItems mutableCopy]);
+
if (savedItems)
[newMenuItems addObjectsFromArray:savedItems];
BOOL preVersion3Client = isPreVersion3Client();
if (!preVersion3Client)
- return;
+ return newMenuItems;
// Restore the modern tags to the menu items whose tags we altered in fixMenusToSendToOldClients.
unsigned newItemsCount = [newMenuItems count];
@@ -285,6 +286,8 @@
if (modernTag != tag)
[item setTag:modernTag];
}
+
+ return newMenuItems;
}
NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
@@ -312,12 +315,11 @@
menuItem.representedObject = element;
}
- NSMutableArray *savedItems = [fixMenusToSendToOldClients(defaultMenuItems) retain];
+ auto savedItems = fixMenusToSendToOldClients(defaultMenuItems);
+
NSArray *delegateSuppliedItems = CallUIDelegate(m_webView, selector, element, defaultMenuItems);
- NSMutableArray *newMenuItems = [delegateSuppliedItems mutableCopy];
- fixMenusReceivedFromOldClients(newMenuItems, savedItems);
- [savedItems release];
- return [newMenuItems autorelease];
+
+ return fixMenusReceivedFromOldClients(delegateSuppliedItems, savedItems.get()).autorelease();
}
void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const ContextMenu* parentMenu)
Modified: trunk/Tools/ChangeLog (191511 => 191512)
--- trunk/Tools/ChangeLog 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Tools/ChangeLog 2015-10-23 21:34:27 UTC (rev 191512)
@@ -1,3 +1,15 @@
+2015-10-23 Anders Carlsson <[email protected]>
+
+ Simplify the WebKitLegacy menu conversion code
+ https://bugs.webkit.org/show_bug.cgi?id=150509
+
+ Reviewed by Andreas Kling.
+
+ Implement the context menu delegate method so we'll test that code path.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):
+
2015-10-23 Per Arne Vollan <[email protected]>
[WinCairo] Improve test results for fast layouttests.
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (191511 => 191512)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-10-23 21:34:27 UTC (rev 191512)
@@ -341,6 +341,11 @@
[self updateTitle:title];
}
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
+{
+ return defaultMenuItems;
+}
+
- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
{
NSAlert *alert = [[NSAlert alloc] init];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes