[webkit-changes] [WebKit/WebKit] 2f4ea4: Crash trying to load tabPageIdentifiers() and popu...

[Timothy Hatcher]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 2f4ea4c094b72386cd25be293b6b6fa2c67064b1
      https://github.com/WebKit/WebKit/commit/2f4ea4c094b72386cd25be293b6b6fa2c67064b1
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
    M Source/WebKit/UIProcess/API/APIPageConfiguration.h
    M Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionActionCocoa.mm
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionURLSchemeHandlerCocoa.mm
    M Source/WebKit/UIProcess/Extensions/WebExtensionAction.h
    M Source/WebKit/UIProcess/Extensions/WebExtensionContext.h
    M Source/WebKit/UIProcess/Extensions/WebExtensionController.cpp
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIAction.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIExtension.mm

  Log Message:
  -----------
  Crash trying to load tabPageIdentifiers() and popupPageIdentifiers().
https://webkit.org/b/268105
rdar://120867910

Reviewed by Brian Weinstein.

Clean up how we track extension tab and action pages, so we don't need to loop over openTabs(),
which is not safe to do while a WKWebView is being created.

Also clean up WKWebViewConfiguration, by not storing the WebExtensionController as
data members, when they are already stored on API::PageConfiguration. Also added
requiredWebExtensionBaseURL() to API::PageConfiguration.

Also made a few more tab and window getters on WebExtensionContext be const, to allow
use inside other const functions, like parameters().

* Source/WebKit/UIProcess/API/APIPageConfiguration.cpp:
(API::PageConfiguration::requiredWebExtensionBaseURL const): Added.
(API::PageConfiguration::setRequiredWebExtensionBaseURL): Added.
(API::PageConfiguration::webExtensionController const): Made const.
(API::PageConfiguration::weakWebExtensionController const): Ditto.
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _requiredWebExtensionBaseURL]): Use APIPageConfiguration.
(-[WKWebViewConfiguration _setRequiredWebExtensionBaseURL:]): Ditto.
(-[WKWebViewConfiguration _strongWebExtensionController]): Ditto.
(-[WKWebViewConfiguration _webExtensionController]): Ditto.
(-[WKWebViewConfiguration _setWebExtensionController:]): Ditto.
(-[WKWebViewConfiguration _weakWebExtensionController]): Ditto.
(-[WKWebViewConfiguration _setWeakWebExtensionController:]): Ditto.
(-[WKWebViewConfiguration _setShouldRelaxThirdPartyCookieBlocking:]): Ditto.
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionActionCocoa.mm:
(WebKit::WebExtensionAction::fallbackAction const): Added helper.
(WebKit::WebExtensionAction::icon): Use fallbackAction().
(WebKit::WebExtensionAction::popupPath const): Ditto.
(WebKit::WebExtensionAction::popupWebView): Use new addPopupPage() method.
(WebKit::WebExtensionAction::label const): Use fallbackAction().
(WebKit::WebExtensionAction::badgeText const): Ditto.
(WebKit::WebExtensionAction::isEnabled const): Ditto.
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::isURLForThisExtension const): Added isValid() to bail earlier.
(WebKit::WebExtensionContext::getOrCreateWindow const): Made const.
(WebKit::WebExtensionContext::getWindow const): Ditto.
(WebKit::WebExtensionContext::getOrCreateTab const): Ditto.
(WebKit::WebExtensionContext::getTab const): Ditto.
(WebKit::WebExtensionContext::getCurrentTab const): Ditto.
(WebKit::WebExtensionContext::focusedWindow const): Ditto.
(WebKit::WebExtensionContext::frontmostWindow const): Ditto.
(WebKit::WebExtensionContext::popupPageIdentifiers const): Use the new map to build the Vector.
(WebKit::WebExtensionContext::tabPageIdentifiers const): Use the new map to build the Vector.
(WebKit::WebExtensionContext::addExtensionTabPage): Added.
(WebKit::WebExtensionContext::relatedWebView): Simplified by using requiredWebExtensionBaseURL().
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionURLSchemeHandlerCocoa.mm:
(WebKit::WebExtensionURLSchemeHandler::platformStartTask): Call addExtensionTabPage().
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
* Source/WebKit/UIProcess/Extensions/WebExtensionController.cpp:
(WebKit::WebExtensionController::parameters const): Use WTF::map().
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIExtension.mm:
(TestWebKitAPI::TEST): Tweak test to conver another case. Correct test that was logging a JSON
error for object cycles.

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