Changeset 275572 in webkit


Ignore:
Timestamp:
Apr 6, 2021 4:54:06 PM (3 years ago)
Author:
Wenson Hsieh
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.

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r275571 r275572  
     12021-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
    1232021-04-06  Jer Noble  <jer.noble@apple.com>
    224
  • trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm

    r275491 r275572  
    3535#import "ShareableBitmap.h"
    3636#import "WKMenuItemIdentifiersPrivate.h"
    37 #import "WKNSURLExtras.h"
    3837#import "WKSharingServicePickerDelegate.h"
    3938#import "WebContextMenuItem.h"
     
    481480    [menuItem setIdentifier:menuItemIdentifier(item.action())];
    482481
    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()];
    487484
    488485    return menuItem;
     
    531528#endif
    532529
    533     auto imageURL = URL([NSURL _web_URLWithWTFString:m_context.webHitTestResultData().absoluteImageURL]);
     530    auto imageURL = URL { URL { }, m_context.webHitTestResultData().absoluteImageURL };
    534531    auto imageBitmap = m_context.webHitTestResultData().imageBitmap;
    535532
     
    548545#if ENABLE(IMAGE_EXTRACTION)
    549546            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()];
    555549            });
    556550#else
     
    581575    switch (item.type()) {
    582576    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;
    588580
    589581    case WebCore::SeparatorType:
Note: See TracChangeset for help on using the changeset viewer.