Title: [294766] trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
- Revision
- 294766
- Author
- [email protected]
- Date
- 2022-05-24 14:37:22 -0700 (Tue, 24 May 2022)
Log Message
[iOS] No message displayed when Parental content filter blocked load
https://bugs.webkit.org/show_bug.cgi?id=240724
Reviewed by Geoffrey Garen.
The request to unblock a load after it has being blocked by the Parental content filter on iOS needs to be
performed in the UI process, since it may show UI. This path does not set the blocked error description on
the content filter like we do in the other path, which is addressed in this patch. This is a regression
from moving the content filtering to the Network process.
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::contentFilterDidBlock):
Canonical link: https://commits.webkit.org/250931@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (294765 => 294766)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2022-05-24 21:36:47 UTC (rev 294765)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2022-05-24 21:37:22 UTC (rev 294766)
@@ -1830,9 +1830,10 @@
m_unblockHandler = unblockHandler;
m_unblockRequestDeniedScript = unblockRequestDeniedScript;
- if (unblockHandler.needsUIProcess())
+ if (unblockHandler.needsUIProcess()) {
+ m_contentFilter->setBlockedError(error);
m_contentFilter->handleProvisionalLoadFailure(error);
- else {
+ } else {
unblockHandler.requestUnblockAsync([this, protectedThis = Ref { *this }](bool unblocked) mutable {
m_unblockHandler.setUnblockedAfterRequest(unblocked);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
