Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 28395deeee71d97f1dc01edf78d30d099d201986
https://github.com/WebKit/WebKit/commit/28395deeee71d97f1dc01edf78d30d099d201986
Author: Sihui Liu <sihui_...@apple.com>
Date: 2025-08-21 (Thu, 21 Aug 2025)
Changed paths:
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
Log Message:
-----------
ASSERTION FAILED: threadLikeAssertion.isCurrent() in
TestWebKitAPI.WebContentRestrictions.MultipleConfigurationFiles
https://bugs.webkit.org/show_bug.cgi?id=297688
rdar://158254318
Reviewed by Per Arne Vollan.
The assertion verifies that CommpetionHandler is created and invoked on the
same thread. However, isURLAllowedWithQueue
currently invokes CompletionHandler on a thread that is different from the
creation thread. This is intended behavior
but violates CommpetionHandler's assumption. To fix the assertion failure, this
patch makes isURLAllowedWithQueue take
ParentalControlsURLFilter instead of CommpetionHandler as argument, and
directly invoke ParentalControlsURLFilter
function when results are available on the brackground thread.
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::responseReceived):
(WebCore::globalQueue): Deleted.
* Source/WebCore/platform/cocoa/ParentalControlsURLFilter.h:
* Source/WebCore/platform/cocoa/ParentalControlsURLFilter.mm:
(WebCore::globalQueue):
(WebCore::ParentalControlsURLFilter::isURLAllowed):
(WebCore::ParentalControlsURLFilter::isURLAllowedWithQueue): Deleted.
Canonical link: https://commits.webkit.org/299016@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
