Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 45e07b5428077bf94cff5940445ca7254e16268e
https://github.com/WebKit/WebKit/commit/45e07b5428077bf94cff5940445ca7254e16268e
Author: Timothy Hatcher <timo...@apple.com>
Date: 2024-07-30 (Tue, 30 Jul 2024)
Changed paths:
M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtension.h
M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionTab.h
M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionWindow.h
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPICookiesCocoa.mm
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIScriptingCocoa.mm
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPITabsCocoa.mm
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIWebNavigationCocoa.mm
M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm
M Source/WebKit/UIProcess/Extensions/WebExtensionTab.h
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIAction.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPICookies.mm
M
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDeclarativeNetRequest.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDevTools.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIExtension.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIMenus.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIRuntime.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIScripting.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIStorage.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPITabs.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebNavigation.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebRequest.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWindows.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionController.mm
M Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.h
M Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.mm
Log Message:
-----------
Additional Web Extensions API changes based on feedback.
https://webkit.org/b/277374
rdar://problem/132843735
Reviewed by Brian Weinstein.
Renamed the protocol method on `_WKWebExtensionTab` from
`mainWebViewForWebExtensionContext:`
to just `webViewForWebExtensionContext:` since
`webViewsForWebExtensionContext:` was removed.
Renamed all uses of `mainWebView` in extensions code to match.
Added `NS_SWIFT_NAME` to `_WKWebExtensionTabChangedProperties`,
`_WKWebExtensionWindowType`,
and `_WKWebExtensionWindowState`.
Finally, use `WK_NULLABLE_RESULT` for `_WKWebExtension` async convenience
methods for better
importation to Swift.
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtension.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionTab.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionWindow.h:
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPICookiesCocoa.mm:
(WebKit::WebExtensionContext::cookiesGetAllCookieStores):
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIScriptingCocoa.mm:
(WebKit::WebExtensionContext::scriptingExecuteScript):
(WebKit::WebExtensionContext::scriptingInsertCSS):
(WebKit::WebExtensionContext::scriptingRemoveCSS):
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPITabsCocoa.mm:
(WebKit::WebExtensionContext::tabsExecuteScript):
(WebKit::WebExtensionContext::tabsInsertCSS):
(WebKit::WebExtensionContext::tabsRemoveCSS):
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIWebNavigationCocoa.mm:
(WebKit::WebExtensionContext::webNavigationGetFrame):
(WebKit::WebExtensionContext::webNavigationGetAllFrames):
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::getCurrentTab const):
(WebKit::WebExtensionContext::reportWebViewConfigurationErrorIfNeeded const):
(WebKit::WebExtensionContext::openInspectors const):
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm:
(WebKit::WebExtensionTab::WebExtensionTab):
(WebKit::WebExtensionTab::webView const):
(WebKit::WebExtensionTab::title const):
(WebKit::WebExtensionTab::size const):
(WebKit::WebExtensionTab::zoomFactor const):
(WebKit::WebExtensionTab::setZoomFactor):
(WebKit::WebExtensionTab::url const):
(WebKit::WebExtensionTab::isLoadingComplete const):
(WebKit::WebExtensionTab::captureVisibleWebpage):
(WebKit::WebExtensionTab::loadURL):
(WebKit::WebExtensionTab::reload):
(WebKit::WebExtensionTab::goBack):
(WebKit::WebExtensionTab::goForward):
(WebKit::WebExtensionTab::processes const):
(WebKit::WebExtensionTab::mainWebView const): Deleted.
* Source/WebKit/UIProcess/Extensions/WebExtensionTab.h:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIAction.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIAction,
ClearTabSpecificActionPropertiesOnNavigation)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPICookies.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPICookies, GetAllIncognito)):
(TestWebKitAPI::TEST(WKWebExtensionAPICookies,
GetAllIncognitoWithPrivateAccess)):
*
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDeclarativeNetRequest.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest, BlockedLoadTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
BlockedLoadInPrivateBrowsingTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
UpdateEnabledRulesetsPerformsCompilation)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
SetExtensionActionOptions)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest, GetMatchedRules)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest, SessionRules)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest, DynamicRules)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
DISABLED_RedirectRule)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
RedirectRuleWithoutHostAccessPermission)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
RedirectRuleWithoutHostPermission)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
ModifyHeadersRule)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
ModifyHeadersRuleWithoutHostAccessPermission)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
ModifyHeadersRuleWithoutHostPermission)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDevTools.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, Basics)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, CreatePanel)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, InspectedWindowEval)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, InspectedWindowReload)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
InspectedWindowReloadIgnoringCache)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, NetworkNavigatedEvent)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, PanelsThemeName)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools, MessagePassingToBackground)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
MessagePassingFromPanelToBackground)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
MessagePassingFromPanelToDevToolsBackground)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
PortMessagePassingToBackground)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
PortMessagePassingFromPanelToBackground)):
(TestWebKitAPI::TEST(WKWebExtensionAPIDevTools,
PortMessagePassingFromPanelToDevToolsBackground)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIExtension.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIExtension, GetViewsForMultipleTabs)):
(TestWebKitAPI::TEST(WKWebExtensionAPIExtension, InIncognitoContext)):
(TestWebKitAPI::TEST(WKWebExtensionAPIExtension,
InIncognitoContextWithoutPrivateAccess)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIMenus.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, ActionMenus)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, ActionMenusWithActiveTab)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, TabMenus)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacActiveTabContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacURLPatternContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacSelectionContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacLinkContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacImageContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacVideoContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacAudioContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacEditableContextMenuItems)):
(TestWebKitAPI::TEST(WKWebExtensionAPIMenus, MacFrameContextMenuItems)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIRuntime.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, GetFrameId)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, SendMessageFromContentScript)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromContentScriptWithAsyncReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromContentScriptWithPromiseReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromContentScriptWithAsyncPromiseReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromContentScriptWithNoReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, SendMessageFromSubframe)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageWithTabFrameAndAsyncReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, SendMessageWithNaNValue)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, ConnectFromContentScript)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, ConnectFromSubframe)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
ConnectFromContentScriptWithMultipleListeners)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
PortDisconnectFromContentScript)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
PortDisconnectFromContentScriptWithMultipleListeners)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, ConnectFromWebPage)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
ConnectFromWebPageWithWrongIdentifier)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime, SendMessageFromWebPage)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromWebPageWithTabFrameAndAsyncReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPIRuntime,
SendMessageFromWebPageWithWrongIdentifier)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIScripting.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, ExecuteScript)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, ExecuteScriptJSONTypes)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, ExecuteScriptWithFrameIds)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, InsertAndRemoveCSS)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting,
InsertAndRemoveCSSWithFrameIds)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, CSSUserOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, CSSAuthorOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, World)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, RegisterContentScripts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting,
RegisterContentScriptsWithCSSUserOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting,
RegisterContentScriptsWithCSSAuthorOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, UpdateContentScripts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, GetContentScripts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, UnregisterContentScripts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting,
RegisteredScriptIsInjectedAfterContextReloads)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, MainWorld)):
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, IsolatedWorld)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIStorage.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIStorage, SetAccessLevelTrustedContexts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIStorage,
SetAccessLevelTrustedAndUntrustedContexts)):
(TestWebKitAPI::TEST(WKWebExtensionAPIStorage, StorageFromSubframe)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPITabs.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, GetCurrentFromOptionsPage)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, QueryWithAccessPrompt)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, DetectLanguage)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, UpdatedEventWithoutPrivateAccess)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, UpdatedEventWithPrivateAccess)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, SendMessage)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, SendMessageWithAsyncReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, SendMessageWithPromiseReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, SendMessageWithAsyncPromiseReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, SendMessageWithoutReply)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs,
SendMessageFromBackgroundPageToFullPageExtensionContent)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs,
SendMessageFromBackgroundToSubframe)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, Connect)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ConnectToSubframe)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, PortDisconnect)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ConnectWithMultipleListeners)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs,
PortDisconnectWithMultipleListeners)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ExecuteScript)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ExecuteScriptJSONTypes)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, InsertAndRemoveCSSInMainFrame)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, InsertAndRemoveCSSInAllFrames)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, CSSUserOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, CSSAuthorOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ActiveTab)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, UserGestureWithoutActiveTab)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs, ActiveTabWithDeniedPermissions)):
(TestWebKitAPI::TEST(WKWebExtensionAPITabs,
ActiveTabRemovedWithDeniedPermissions)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebNavigation.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, EventFiringTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, AllowedFilterTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, DeniedFilterTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, AllEventsFiredTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation,
OnErrorOccurredProvisionalLoadEvent)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation,
OnErrorOccurredDuringLoadEvent)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, GetMainFrame)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, GetSubframe)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, GetAllFrames)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, ErrorOccurred)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebNavigation, Errors)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebRequest.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, EventFiringTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, AllowedFilterTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, DeniedFilterTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, AllEventsFiredTest)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, ErrorOccurred)):
(TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, RedirectOccurred)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWindows.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIWindows, GetCurrentFromOptionsPage)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionController.mm:
(TestWebKitAPI::TEST(WKWebExtensionController, CSSUserOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionController, CSSAuthorOrigin)):
(TestWebKitAPI::TEST(WKWebExtensionController, WebAccessibleResources)):
(TestWebKitAPI::TEST(WKWebExtensionController, WebAccessibleResourcesV2)):
* Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.h:
* Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.mm:
(-[TestWebExtensionManager initForExtension:extensionControllerConfiguration:]):
(-[TestWebExtensionTab initWithWindow:extensionController:]):
(-[TestWebExtensionTab changeWebViewIfNeededForURL:forExtensionContext:]):
(-[TestWebExtensionTab webViewForWebExtensionContext:]):
(-[TestWebExtensionTab
reloadFromOrigin:forWebExtensionContext:completionHandler:]):
(-[TestWebExtensionTab goBackForWebExtensionContext:completionHandler:]):
(-[TestWebExtensionTab goForwardForWebExtensionContext:completionHandler:]):
(-[TestWebExtensionWindow setTabs:]):
(-[TestWebExtensionWindow openNewTabAtIndex:]):
(-[TestWebExtensionWindow closeTab:windowIsClosing:]):
(-[TestWebExtensionWindow replaceTab:withTab:]):
(-[TestWebExtensionTab mainWebViewForWebExtensionContext:]): Deleted.
Canonical link: https://commits.webkit.org/281607@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
