Changeset 290103 in webkit

Timestamp:

Feb 17, 2022, 6:31:16 PM (4 years ago)

Author:

Kate Cheney

Message:

Refactor share menu item presentation
​https://bugs.webkit.org/show_bug.cgi?id=236806
<rdar://problem/88858606>

Reviewed by Aditya Keerthi.

Source/WebCore:

• page/ContextMenuController.cpp:

(WebCore::ContextMenuController::populate):

Source/WebCore/PAL:

• pal/spi/mac/NSSharingServicePickerSPI.h:

Source/WebKit:

• UIProcess/mac/WebContextMenuProxyMac.mm:

(WebKit::WebContextMenuProxyMac::setupServicesMenu):
(WebKit::WebContextMenuProxyMac::getShareMenuItem):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h (modified) (2 diffs)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-17  Kate Cheney  <katherine_cheney@apple.com>
+
+        Refactor share menu item presentation
+        https://bugs.webkit.org/show_bug.cgi?id=236806
+        <rdar://problem/88858606>
+
+        Reviewed by Aditya Keerthi.
+
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::populate):
+
 2022-02-17  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2022-02-17  Kate Cheney  <katherine_cheney@apple.com>
+
+        Refactor share menu item presentation
+        https://bugs.webkit.org/show_bug.cgi?id=236806
+        <rdar://problem/88858606>
+
+        Reviewed by Aditya Keerthi.
+
+        * pal/spi/mac/NSSharingServicePickerSPI.h:
+
 2022-02-17  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h

@@ -28 +28 @@
 #import <AppKit/NSSharingService_Private.h>
 
+@interface NSSharingServicePicker (Staging_r88855017)
+- (NSMenuItem *)standardShareMenuItem;
+@end
+
 #else
 
@@ -41 +45 @@
 @interface NSSharingServicePicker (Private)
 @property NSSharingServicePickerStyle style;
+- (NSMenuItem *)standardShareMenuItem;
 - (NSMenu *)menu;
 - (void)getMenuWithCompletion:(void(^)(NSMenu *))completion;

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -841 +841 @@
     ContextMenuItem ShareMenuItem;
 #else
-    ContextMenuItem ShareMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
+    ContextMenuItem ShareMenuItem(ActionType, ContextMenuItemTagShareMenu, emptyString());
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-17  Kate Cheney  <katherine_cheney@apple.com>
+
+        Refactor share menu item presentation
+        https://bugs.webkit.org/show_bug.cgi?id=236806
+        <rdar://problem/88858606>
+
+        Reviewed by Aditya Keerthi.
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+        (WebKit::WebContextMenuProxyMac::getShareMenuItem):
+
 2022-02-17  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm

@@ -259 +259 @@
     [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setAttachmentID:m_context.controlledImageAttachmentID()];
 
-    m_menu = adoptNS([[picker menu] copy]);
+    if ([picker respondsToSelector:@selector(standardShareMenuItem)])
+        m_menu = adoptNS([[[picker standardShareMenuItem] menu] copy]);
+    else
+        m_menu = adoptNS([[picker menu] copy]);
 
     if (!hasControlledImage)
@@ -406 +409 @@
     }
 
+    auto sharingServicePicker = adoptNS([[NSSharingServicePicker alloc] initWithItems:items.get()]);
+    if ([sharingServicePicker respondsToSelector:@selector(standardShareMenuItem)]) {
+        NSMenuItem *shareMenuItem = [sharingServicePicker standardShareMenuItem];
+        shareMenuItem.identifier = _WKMenuItemIdentifierShareMenu;
+        completionHandler(shareMenuItem);
+        return;
+    }
+
     getStandardShareMenuItem(items.get(), makeBlockPtr([completionHandler = WTFMove(completionHandler), protectedThis = Ref { *this }, this](NSMenuItem *item) mutable {
         if (!item) {