Changeset 275572 in webkit
- Timestamp:
- Apr 6, 2021 4:54:06 PM (3 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r275571 r275572 1 2021-04-06 Wenson Hsieh <wenson_hsieh@apple.com> 2 3 Address some post-landing comments after r275491 4 https://bugs.webkit.org/show_bug.cgi?id=224126 5 6 Reviewed by Darin Adler. 7 8 Address some minor feedback; no change in behavior. 9 10 * UIProcess/mac/WebContextMenuProxyMac.mm: 11 (WebKit::createMenuActionItem): 12 13 Remove an unnecessary local variable. 14 15 (WebKit::WebContextMenuProxyMac::getContextMenuFromItems): 16 17 Use `WTF::URL` instead of `NSURL`, and remove a header import that is now unnecessary. 18 19 (WebKit::WebContextMenuProxyMac::getContextMenuItem): 20 21 Remove some more unnecessary local variables. 22 1 23 2021-04-06 Jer Noble <jer.noble@apple.com> 2 24 -
trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
r275491 r275572 35 35 #import "ShareableBitmap.h" 36 36 #import "WKMenuItemIdentifiersPrivate.h" 37 #import "WKNSURLExtras.h"38 37 #import "WKSharingServicePickerDelegate.h" 39 38 #import "WebContextMenuItem.h" … … 481 480 [menuItem setIdentifier:menuItemIdentifier(item.action())]; 482 481 483 if (item.userData()) { 484 auto wrapper = adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]); 485 [menuItem setRepresentedObject:wrapper.get()]; 486 } 482 if (item.userData()) 483 [menuItem setRepresentedObject:adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]).get()]; 487 484 488 485 return menuItem; … … 531 528 #endif 532 529 533 auto imageURL = URL ([NSURL _web_URLWithWTFString:m_context.webHitTestResultData().absoluteImageURL]);530 auto imageURL = URL { URL { }, m_context.webHitTestResultData().absoluteImageURL }; 534 531 auto imageBitmap = m_context.webHitTestResultData().imageBitmap; 535 532 … … 548 545 #if ENABLE(IMAGE_EXTRACTION) 549 546 page->computeCanRevealImage(imageURL, *imageBitmap, [protectedThis = WTFMove(protectedThis), revealImageItem = WTFMove(*revealImageItem)] (bool canRevealImage) mutable { 550 if (!canRevealImage) 551 return; 552 553 auto nsMenuItem = createMenuActionItem(revealImageItem); 554 [protectedThis->m_menu addItem:nsMenuItem.get()]; 547 if (canRevealImage) 548 [protectedThis->m_menu addItem:createMenuActionItem(revealImageItem).get()]; 555 549 }); 556 550 #else … … 581 575 switch (item.type()) { 582 576 case WebCore::ActionType: 583 case WebCore::CheckableActionType: { 584 auto nsMenuItem = createMenuActionItem(item); 585 completionHandler(nsMenuItem.get()); 586 return; 587 } 577 case WebCore::CheckableActionType: 578 completionHandler(createMenuActionItem(item).get()); 579 return; 588 580 589 581 case WebCore::SeparatorType:
Note: See TracChangeset
for help on using the changeset viewer.