Attachment 341461 Details for Bug 186041 – Patch

[patch] Patch

bug-186041-20180528175359.patch (text/plain), 7.98 KB, created by Jeff Miller on 2018-05-28 17:54:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Miller

Created: 2018-05-28 17:54:00 PDT

Size: 7.98 KB

patch

obsolete

>Subversion Revision: 232245
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f6f88965253ac7713a0778ae0f85cc5206e0bc60..1dc38281596fa38caafff82f2224d3960b709b16 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-28  Jeff Miller  <jeffm@apple.com>
>+
>+        Expose additional WKMenuItemIdentifier strings
>+        https://bugs.webkit.org/show_bug.cgi?id=186041
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Expose identifiers for media-related menu items.
>+
>+        * UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm:
>+        Define new identifiers.
>+
>+        * UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
>+        Declare new identifiers.
>+
>+        * UIProcess/mac/WebContextMenuProxyMac.mm:
>+        (WebKit::menuItemIdentifier):
>+        Map to new identifiers.
>+
> 2018-05-28  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.21.3 release.
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm b/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
>index 3de26003ebf7ba57f7134dd6dd79155592660579..7c3d7794d9efc82935c949c729b240a591ee951c 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
>@@ -31,8 +31,10 @@
> NSString * const _WKMenuItemIdentifierCopy = @"WKMenuItemIdentifierCopy";
> NSString * const _WKMenuItemIdentifierCopyImage = @"WKMenuItemIdentifierCopyImage";
> NSString * const _WKMenuItemIdentifierCopyLink = @"WKMenuItemIdentifierCopyLink";
>+NSString * const _WKMenuItemIdentifierCopyMediaLink = @"WKMenuItemIdentifierCopyMediaLink";
> NSString * const _WKMenuItemIdentifierDownloadImage = @"WKMenuItemIdentifierDownloadImage";
> NSString * const _WKMenuItemIdentifierDownloadLinkedFile = @"WKMenuItemIdentifierDownloadLinkedFile";
>+NSString * const _WKMenuItemIdentifierDownloadMedia = @"WKMenuItemIdentifierDownloadMedia";
> NSString * const _WKMenuItemIdentifierGoBack = @"WKMenuItemIdentifierGoBack";
> NSString * const _WKMenuItemIdentifierGoForward = @"WKMenuItemIdentifierGoForward";
> NSString * const _WKMenuItemIdentifierInspectElement = @"WKMenuItemIdentifierInspectElement";
>@@ -41,10 +43,12 @@ NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow = @"WKMenuItemIdentif
> NSString * const _WKMenuItemIdentifierOpenImageInNewWindow = @"WKMenuItemIdentifierOpenImageInNewWindow";
> NSString * const _WKMenuItemIdentifierOpenLink = @"WKMenuItemIdentifierOpenLink";
> NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow = @"WKMenuItemIdentifierOpenLinkInNewWindow";
>+NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow = @"WKMenuItemIdentifierOpenMediaInNewWindow";
> NSString * const _WKMenuItemIdentifierPaste = @"WKMenuItemIdentifierPaste";
> NSString * const _WKMenuItemIdentifierReload = @"WKMenuItemIdentifierReload";
> NSString * const _WKMenuItemIdentifierSearchWeb = @"WKMenuItemIdentifierSearchWeb";
> NSString * const _WKMenuItemIdentifierShowHideMediaControls = @"WKMenuItemIdentifierShowHideMediaControls";
>+NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen = @"WKMenuItemIdentifierToggleEnhancedFullScreen";
> NSString * const _WKMenuItemIdentifierToggleFullScreen = @"WKMenuItemIdentifierToggleFullScreen";
> 
> NSString * const _WKMenuItemIdentifierShareMenu = @"WKMenuItemIdentifierShareMenu";
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h
>index 894c9aaa9e2accfc0ca5d36a0b3cdedc083d562e..048193669d673df180a312d9209f22ad38ab5886 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h
>@@ -33,8 +33,10 @@
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>+WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>+WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadMedia WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>@@ -43,10 +45,12 @@ WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_A
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>+WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>+WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> 
> WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
>index be6bd299a950e0662cc6cc4e80eb7f67ec2e199d..f43d8174c6e835ade105138fd5c62a1272679502 100644
>--- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
>@@ -354,12 +354,18 @@ static NSString *menuItemIdentifier(const ContextMenuAction action)
>     case ContextMenuItemTagCopyLinkToClipboard:
>         return _WKMenuItemIdentifierCopyLink;
> 
>+    case ContextMenuItemTagCopyMediaLinkToClipboard:
>+        return _WKMenuItemIdentifierCopyMediaLink;
>+
>     case ContextMenuItemTagDownloadImageToDisk:
>         return _WKMenuItemIdentifierDownloadImage;
> 
>     case ContextMenuItemTagDownloadLinkToDisk:
>         return _WKMenuItemIdentifierDownloadLinkedFile;
> 
>+    case ContextMenuItemTagDownloadMediaToDisk:
>+        return _WKMenuItemIdentifierDownloadMedia;
>+
>     case ContextMenuItemTagGoBack:
>         return _WKMenuItemIdentifierGoBack;
> 
>@@ -384,6 +390,9 @@ static NSString *menuItemIdentifier(const ContextMenuAction action)
>     case ContextMenuItemTagOpenLinkInNewWindow:
>         return _WKMenuItemIdentifierOpenLinkInNewWindow;
> 
>+    case ContextMenuItemTagOpenMediaInNewWindow:
>+        return _WKMenuItemIdentifierOpenMediaInNewWindow;
>+
>     case ContextMenuItemTagPaste:
>         return _WKMenuItemIdentifierPaste;
> 
>@@ -396,6 +405,9 @@ static NSString *menuItemIdentifier(const ContextMenuAction action)
>     case ContextMenuItemTagToggleMediaControls:
>         return _WKMenuItemIdentifierShowHideMediaControls;
> 
>+    case ContextMenuItemTagToggleVideoEnhancedFullscreen:
>+        return _WKMenuItemIdentifierToggleEnhancedFullScreen;
>+
>     case ContextMenuItemTagToggleVideoFullscreen:
>         return _WKMenuItemIdentifierToggleFullScreen;
>

Flags:

mitz: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186041: 341461