Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: bf48e0507614504ccebc883b536262dc534eafcd
https://github.com/WebKit/WebKit/commit/bf48e0507614504ccebc883b536262dc534eafcd
Author: Alex Christensen <[email protected]>
Date: 2025-10-21 (Tue, 21 Oct 2025)
Changed paths:
M Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
M Source/WTF/wtf/PlatformHave.h
M Source/WebCore/loader/ContentFilter.cpp
M Source/WebCore/loader/ContentFilterClient.h
M Source/WebCore/loader/DocumentLoader.cpp
M Source/WebCore/loader/DocumentLoader.h
M Source/WebCore/page/DeprecatedGlobalSettings.h
M Source/WebCore/platform/PlatformContentFilter.h
M Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h
M Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
M Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
M Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
M Source/WebKit/NetworkProcess/NetworkResourceLoader.h
M Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
Log Message:
-----------
Remove runtime switch for UsesWebContentRestrictionsForFilter
https://bugs.webkit.org/show_bug.cgi?id=301222
rdar://163142490
Reviewed by Sihui Liu.
UsesWebContentRestrictionsForFilter is always true. The runtime switch is no
longer needed,
so just keep the path where it is true. Also, upstream the definition of
HAVE_WEBCONTENTRESTRICTIONS.
* Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml:
* Source/WTF/wtf/PlatformHave.h:
* Source/WebCore/loader/ContentFilter.cpp:
(WebCore::ContentFilter::create):
* Source/WebCore/loader/ContentFilterClient.h:
* Source/WebCore/loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::usesWebContentRestrictions): Deleted.
* Source/WebCore/loader/DocumentLoader.h:
* Source/WebCore/page/DeprecatedGlobalSettings.h:
(WebCore::DeprecatedGlobalSettings::setUsesWebContentRestrictionsForFilter):
Deleted.
(WebCore::DeprecatedGlobalSettings::usesWebContentRestrictionsForFilter):
Deleted.
* Source/WebCore/platform/PlatformContentFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::enabled const):
(WebCore::ParentalControlsContentFilter::ParentalControlsContentFilter):
(WebCore::ParentalControlsContentFilter::responseReceived):
(WebCore::ParentalControlsContentFilter::addData):
(WebCore::ParentalControlsContentFilter::finishedAddingData):
(WebCore::ParentalControlsContentFilter::unblockHandler const):
* Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h:
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::usesWebContentRestrictions): Deleted.
* Source/WebKit/NetworkProcess/NetworkResourceLoader.h:
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::contentFilterDidBlockLoadForFrameShared):
Canonical link: https://commits.webkit.org/301934@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
