[webkit-changes] [WebKit/WebKit] 8f690e: Add support for match_about_blank and match_origin...

[Timothy Hatcher]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 8f690ea0194be50ad844294dcd88df0224b270cd
      https://github.com/WebKit/WebKit/commit/8f690ea0194be50ad844294dcd88df0224b270cd
  Author: Timothy Hatcher <timothy at apple.com>
  Date:   2025-02-28 (Fri, 28 Feb 2025)

  Changed paths:
    M Source/WebCore/dom/ExtensionStyleSheets.cpp
    M Source/WebCore/page/LocalFrame.cpp
    M Source/WebCore/page/UserContentTypes.h
    M Source/WebCore/page/UserScript.cpp
    M Source/WebCore/page/UserScript.h
    M Source/WebCore/page/UserStyleSheet.cpp
    M Source/WebCore/page/UserStyleSheet.h
    M Source/WebKit/Shared/Extensions/WebExtensionDynamicScripts.serialization.in
    M Source/WebKit/Shared/Extensions/WebExtensionRegisteredScriptParameters.h
    M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
    M Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
    M Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp
    M Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIScriptingCocoa.mm
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
    M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDynamicScriptsCocoa.mm
    M Source/WebKit/UIProcess/Extensions/WebExtension.cpp
    M Source/WebKit/UIProcess/Extensions/WebExtension.h
    M Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIScriptingCocoa.mm
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.h
    M Source/WebKitLegacy/mac/WebView/WebView.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIScripting.mm

  Log Message:
  -----------
  Add support for match_about_blank and match_origin_as_fallback.
https://webkit.org/b/275622
rdar://57613243

Reviewed by Brian Weinstein.

Added support for WebCore::UserScript and WebCore::UserStylesheet to match against the parent
document's URL when the frame is about:blank, data: or blob:.

Hook that up to match_about_blank and match_origin_as_fallback in content_scripts, and
matchOriginAsFallback in registered content scripts.

* Source/WebCore/dom/ExtensionStyleSheets.cpp:
(WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache const):
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::injectUserScriptImmediately):
* Source/WebCore/page/UserContentTypes.h:
* Source/WebCore/page/UserScript.cpp:
(WebCore::UserScript::UserScript):
* Source/WebCore/page/UserScript.h:
(WebCore::UserScript::UserScript):
(WebCore::UserScript::matchParentFrame const):
* Source/WebCore/page/UserStyleSheet.cpp:
(WebCore::UserStyleSheet::UserStyleSheet):
* Source/WebCore/page/UserStyleSheet.h:
(WebCore::UserStyleSheet::UserStyleSheet):
(WebCore::UserStyleSheet::matchParentFrame const):
* Source/WebKit/Shared/Extensions/WebExtensionDynamicScripts.serialization.in:
* Source/WebKit/Shared/Extensions/WebExtensionRegisteredScriptParameters.h:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
* Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm:
(-[_WKUserStyleSheet initWithSource:forMainFrameOnly:]):
(-[_WKUserStyleSheet initWithSource:forWKWebView:forMainFrameOnly:includeMatchPatternStrings:excludeMatchPatternStrings:baseURL:level:contentWorld:]):
* Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp:
(_WebKitUserStyleSheet::_WebKitUserStyleSheet):
* Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIScriptingCocoa.mm:
(WebKit::WebExtensionContext::createInjectedContentForScripts):
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::addInjectedContent):
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDynamicScriptsCocoa.mm:
(WebKit::WebExtensionDynamicScripts::injectStyleSheets):
(WebKit::WebExtensionDynamicScripts::WebExtensionRegisteredScript::merge):
* Source/WebKit/UIProcess/Extensions/WebExtension.cpp:
(WebKit::WebExtension::populateContentScriptPropertiesIfNeeded):
* Source/WebKit/UIProcess/Extensions/WebExtension.h:
* Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIScriptingCocoa.mm:
(WebKit::toWebAPI):
(WebKit::WebExtensionAPIScripting::parseRegisteredContentScripts):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::addUserScript):
(WebKit::WebPage::addUserStyleSheet):
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(+[WebView _addUserStyleSheetToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectedFrames:]):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIScripting.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, RegisterContentScriptsMatchOriginAsFallback)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, MatchAboutBlank)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, MatchOriginAsFallbackWithAboutBlank)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, MatchOriginAsFallbackWithData)): Added.
(TestWebKitAPI::TEST(WKWebExtensionAPIScripting, MatchOriginAsFallbackWithBlob)): Added.

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



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications