[webkit-changes] [WebKit/WebKit] cec52d: Web Extensions: menuId and parentMenuId is wrong i...

[Timothy Hatcher]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: cec52d1f1d681336033df01c7a8f099510086fb7
      https://github.com/WebKit/WebKit/commit/cec52d1f1d681336033df01c7a8f099510086fb7
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2023-12-05 (Tue, 05 Dec 2023)

  Changed paths:
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
    M Source/WebKit/UIProcess/Extensions/WebExtensionContext.h
    M Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIMenusCocoa.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIMenus.mm

  Log Message:
  -----------
  Web Extensions: menuId and parentMenuId is wrong in the menus API.
https://webkit.org/b/265843
rdar://problem/119164396

Reviewed by Brian Weinstein.

Fix the keys we use for menuItemId and parentMenuItemId. Also make tab menu items
collapse into an extension titled submenu since these will often be next to other
extensions and should be grouped to prevent overloading menus. This can be shared
with the implementation we had for extension context menus.

* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::platformMenuItems const):
(WebKit::WebExtensionContext::singleMenuItemOrExtensionItemWithSubmenu const):
(WebKit::WebExtensionContext::addItemsToContextMenu):
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
* Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIMenusCocoa.mm:
(WebKit::WebExtensionContextProxy::dispatchMenusClickedEvent):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIMenus.mm:
(TestWebKitAPI::TEST):

Canonical link: https://commits.webkit.org/271560@main