Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 857da87962a64df24a100199dfd8022f3012756a
https://github.com/WebKit/WebKit/commit/857da87962a64df24a100199dfd8022f3012756a
Author: Timothy Hatcher <timo...@apple.com>
Date: 2024-06-25 (Tue, 25 Jun 2024)
Changed paths:
M Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionDataRecord.h
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIDeclarativeNetRequestCocoa.mm
M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionCocoa.mm
M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
M
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestRule.mm
M Source/WebKit/UIProcess/Extensions/WebExtension.h
M Source/WebKit/UIProcess/Extensions/WebExtensionContext.h
Log Message:
-----------
declarativeNetRequest enabled rule sets store on WebExtensionContext not
WebExtension.
https://webkit.org/b/270579
rdar://problem/124147420
Reviewed by Brian Weinstein.
Added m_enabledStaticRulesetIDs to WebExtensionContext, and pre-populate it
with the
enabled rules from WebExtension. Also reference m_enabledStaticRulesetIDs when
checking
if a ruleset is enabled instead of WebExtension.
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionDataRecord.h:
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIDeclarativeNetRequestCocoa.mm:
(WebKit::WebExtensionContext::declarativeNetRequestGetEnabledRulesets):
Simplified.
(WebKit::WebExtensionContext::loadDeclarativeNetRequestRulesetStateFromStorage):
Load the default state
or the saved state into m_enabledStaticRulesetIDs.
(WebKit::WebExtensionContext::declarativeNetRequestValidateRulesetIdentifiers):
Simplified.
(WebKit::WebExtensionContext::declarativeNetRequestToggleRulesets): Ditto.
(WebKit::WebExtensionContext::declarativeNetRequestEnabledRulesetCount):
Deleted.
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionCocoa.mm:
(WebKit::WebExtension::declarativeNetRequestRulesets): Return const to prevent
modification.
(WebKit::WebExtension::declarativeNetRequestRuleset): Added.
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::unloadDeclarativeNetRequestState):
(WebKit::WebExtensionContext::loadDeclarativeNetRequestRules):
*
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestRule.mm:
* Source/WebKit/UIProcess/Extensions/WebExtension.h:
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
(WebKit::WebExtensionContext::declarativeNetRequestEnabledRulesetCount): Added.
Canonical link: https://commits.webkit.org/280354@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
