Title: [275572] trunk/Source/WebKit
- Revision
- 275572
- Author
- wenson_hs...@apple.com
- Date
- 2021-04-06 16:54:06 -0700 (Tue, 06 Apr 2021)
Log Message
Address some post-landing comments after r275491
https://bugs.webkit.org/show_bug.cgi?id=224126
Reviewed by Darin Adler.
Address some minor feedback; no change in behavior.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::createMenuActionItem):
Remove an unnecessary local variable.
(WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
Use `WTF::URL` instead of `NSURL`, and remove a header import that is now unnecessary.
(WebKit::WebContextMenuProxyMac::getContextMenuItem):
Remove some more unnecessary local variables.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (275571 => 275572)
--- trunk/Source/WebKit/ChangeLog 2021-04-06 23:51:54 UTC (rev 275571)
+++ trunk/Source/WebKit/ChangeLog 2021-04-06 23:54:06 UTC (rev 275572)
@@ -1,3 +1,25 @@
+2021-04-06 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Address some post-landing comments after r275491
+ https://bugs.webkit.org/show_bug.cgi?id=224126
+
+ Reviewed by Darin Adler.
+
+ Address some minor feedback; no change in behavior.
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::createMenuActionItem):
+
+ Remove an unnecessary local variable.
+
+ (WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
+
+ Use `WTF::URL` instead of `NSURL`, and remove a header import that is now unnecessary.
+
+ (WebKit::WebContextMenuProxyMac::getContextMenuItem):
+
+ Remove some more unnecessary local variables.
+
2021-04-06 Jer Noble <jer.no...@apple.com>
[MediaSession] Add optional mediaTime and hostTime arguments to the playSession() command.
Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (275571 => 275572)
--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2021-04-06 23:51:54 UTC (rev 275571)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2021-04-06 23:54:06 UTC (rev 275572)
@@ -34,7 +34,6 @@
#import "ServicesController.h"
#import "ShareableBitmap.h"
#import "WKMenuItemIdentifiersPrivate.h"
-#import "WKNSURLExtras.h"
#import "WKSharingServicePickerDelegate.h"
#import "WebContextMenuItem.h"
#import "WebContextMenuItemData.h"
@@ -480,10 +479,8 @@
[menuItem setTarget:[WKMenuTarget sharedMenuTarget]];
[menuItem setIdentifier:menuItemIdentifier(item.action())];
- if (item.userData()) {
- auto wrapper = adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]);
- [menuItem setRepresentedObject:wrapper.get()];
- }
+ if (item.userData())
+ [menuItem setRepresentedObject:adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]).get()];
return menuItem;
}
@@ -530,7 +527,7 @@
}
#endif
- auto imageURL = URL([NSURL _web_URLWithWTFString:m_context.webHitTestResultData().absoluteImageURL]);
+ auto imageURL = URL { URL { }, m_context.webHitTestResultData().absoluteImageURL };
auto imageBitmap = m_context.webHitTestResultData().imageBitmap;
auto sparseMenuItems = retainPtr([NSPointerArray strongObjectsPointerArray]);
@@ -547,11 +544,8 @@
if (revealImageItem && page && imageBitmap) {
#if ENABLE(IMAGE_EXTRACTION)
page->computeCanRevealImage(imageURL, *imageBitmap, [protectedThis = WTFMove(protectedThis), revealImageItem = WTFMove(*revealImageItem)] (bool canRevealImage) mutable {
- if (!canRevealImage)
- return;
-
- auto nsMenuItem = createMenuActionItem(revealImageItem);
- [protectedThis->m_menu addItem:nsMenuItem.get()];
+ if (canRevealImage)
+ [protectedThis->m_menu addItem:createMenuActionItem(revealImageItem).get()];
});
#else
UNUSED_PARAM(imageURL);
@@ -580,11 +574,9 @@
switch (item.type()) {
case WebCore::ActionType:
- case WebCore::CheckableActionType: {
- auto nsMenuItem = createMenuActionItem(item);
- completionHandler(nsMenuItem.get());
+ case WebCore::CheckableActionType:
+ completionHandler(createMenuActionItem(item).get());
return;
- }
case WebCore::SeparatorType:
completionHandler(NSMenuItem.separatorItem);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
