Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 859fcd1ec2762af0ff1450c44d7064bac9eb3d4d
https://github.com/WebKit/WebKit/commit/859fcd1ec2762af0ff1450c44d7064bac9eb3d4d
Author: Jessica Lee <[email protected]>
Date: 2026-04-23 (Thu, 23 Apr 2026)
Changed paths:
M Source/WebCore/loader/ContentFilter.cpp
M Source/WebCore/loader/ContentFilter.h
M Source/WebCore/loader/DocumentLoader.cpp
M Source/WebCore/platform/PlatformContentFilter.h
M Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h
M Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
M Source/WebCore/platform/cocoa/ParentalControlsURLFilter.h
M Source/WebCore/platform/cocoa/ParentalControlsURLFilter.mm
M Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
M Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
M Source/WebKit/Shared/ios/WebParentalControlsURLFilter.h
M Source/WebKit/Shared/ios/WebParentalControlsURLFilter.mm
Log Message:
-----------
Add a flag to track if we are loading a mainframe to Parental Control content
filters
https://bugs.webkit.org/show_bug.cgi?id=312965
rdar://175314314
Reviewed by Per Arne Vollan.
Parental Control content filters need a clearer way to distinguish between
loading a mainframe
vs iframe. Right now, we just make mainDocumentURL null if we are loading a
main frame. This
`change adds an explicit flag for the Parental Controls content filter.
No new tests needed.
* Source/WebCore/loader/ContentFilter.cpp:
(WebCore::ContentFilter::create):
* Source/WebCore/loader/ContentFilter.h:
* Source/WebCore/loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::startLoadingMainResource):
* Source/WebCore/platform/PlatformContentFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::ParentalControlsContentFilter):
(WebCore::ParentalControlsContentFilter::responseReceived):
* Source/WebCore/platform/cocoa/ParentalControlsURLFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsURLFilter.mm:
(WebCore::ParentalControlsURLFilter::isURLAllowed):
(WebCore::ParentalControlsURLFilter::isURLAllowedImpl):
* Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp:
(WebKit::PendingDownload::PendingDownload):
(WebKit::PendingDownload::willSendRedirectedRequest):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startContentFiltering):
* Source/WebKit/Shared/ios/WebParentalControlsURLFilter.h:
* Source/WebKit/Shared/ios/WebParentalControlsURLFilter.mm:
(WebKit::WebParentalControlsURLFilter::isURLAllowedImpl):
Canonical link: https://commits.webkit.org/311831@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
