Branch: refs/heads/main Home: https://github.com/WebKit/WebKit Commit: 4b60d0769ec8807c465803dfba4f3c43be587ffd https://github.com/WebKit/WebKit/commit/4b60d0769ec8807c465803dfba4f3c43be587ffd Author: Ryosuke Niwa <rn...@webkit.org> Date: 2025-08-12 (Tue, 12 Aug 2025)
Changed paths: M LayoutTests/TestExpectations M LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/http-accept-header.sub-expected.txt M LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.sharedworker-expected.txt M Source/WebCore/Modules/fetch/FetchRequestDestination.idl M Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp M Source/WebCore/bindings/js/CachedScriptFetcher.cpp M Source/WebCore/bindings/js/CachedScriptFetcher.h M Source/WebCore/bindings/js/ScriptModuleLoader.cpp M Source/WebCore/dom/LoadableClassicScript.cpp M Source/WebCore/dom/ScriptElementCachedScriptFetcher.cpp M Source/WebCore/dom/ScriptElementCachedScriptFetcher.h M Source/WebCore/html/parser/HTMLResourcePreloader.cpp M Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp M Source/WebCore/inspector/agents/InspectorPageAgent.cpp M Source/WebCore/loader/DefaultResourceLoadPriority.cpp M Source/WebCore/loader/FetchOptionsDestination.h M Source/WebCore/loader/IntegrityPolicy.cpp M Source/WebCore/loader/LinkLoader.cpp M Source/WebCore/loader/ResourceLoadInfo.cpp M Source/WebCore/loader/SubresourceLoader.cpp M Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp M Source/WebCore/loader/cache/CachedResource.cpp M Source/WebCore/loader/cache/CachedResource.h M Source/WebCore/loader/cache/CachedResourceLoader.cpp M Source/WebCore/loader/cache/CachedResourceRequest.cpp M Source/WebCore/loader/cache/CachedScript.cpp M Source/WebCore/loader/cache/CachedScript.h M Source/WebCore/loader/cache/MemoryCache.cpp M Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp M Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in M Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp Log Message: ----------- JSON module should be fetched with JSON mime type in accept https://bugs.webkit.org/show_bug.cgi?id=297263 Reviewed by Anne van Kesteren. Make JSON module fetch using JSON mime type: application/json,*/*;q=0.5 To do this, this PR introduces CachedResource::Type::JSON and FetchOptionsDestination::Json. The aforementioned JSON mime type is used in the accept header when requesting a JSON module. * LayoutTests/TestExpectations: * LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/http-accept-header.sub-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.sharedworker-expected.txt: * Source/WebCore/Modules/fetch/FetchRequestDestination.idl: * Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp: (WebCore::CachedModuleScriptLoader::load): * Source/WebCore/bindings/js/CachedScriptFetcher.cpp: (WebCore::CachedScriptFetcher::requestModuleScript const): (WebCore::CachedScriptFetcher::requestScriptWithCache const): * Source/WebCore/bindings/js/CachedScriptFetcher.h: * Source/WebCore/bindings/js/ScriptModuleLoader.cpp: (WebCore::ScriptModuleLoader::importModule): * Source/WebCore/dom/LoadableClassicScript.cpp: (WebCore::LoadableNonModuleScriptBase::load): * Source/WebCore/dom/ScriptElementCachedScriptFetcher.cpp: (WebCore::ScriptElementCachedScriptFetcher::requestModuleScript const): * Source/WebCore/dom/ScriptElementCachedScriptFetcher.h: * Source/WebCore/html/parser/HTMLResourcePreloader.cpp: (WebCore::PreloadRequest::resourceRequest): * Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp: (WebCore::InspectorNetworkAgent::cachedResourceContent): * Source/WebCore/inspector/agents/InspectorPageAgent.cpp: (WebCore::InspectorPageAgent::inspectorResourceType): * Source/WebCore/loader/DefaultResourceLoadPriority.cpp: (WebCore::DefaultResourceLoadPriority::forResourceType): * Source/WebCore/loader/FetchOptionsDestination.h: * Source/WebCore/loader/IntegrityPolicy.cpp: (WebCore::shouldRequestBeBlockedByIntegrityPolicy): * Source/WebCore/loader/LinkLoader.cpp: (WebCore::LinkLoader::resourceTypeFromAsAttribute): (WebCore::createLinkPreloadResourceClient): (WebCore::LinkLoader::isSupportedType): (WebCore::LinkLoader::preloadIfNeeded): * Source/WebCore/loader/ResourceLoadInfo.cpp: (WebCore::ContentExtensions::toResourceType): * Source/WebCore/loader/SubresourceLoader.cpp: (WebCore::logResourceLoaded): * Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp: (WebCore::LegacyWebArchive::createInternal): * Source/WebCore/loader/cache/CachedResource.cpp: (WebCore::deadDecodedDataDeletionIntervalForResourceType): * Source/WebCore/loader/cache/CachedResource.h: * Source/WebCore/loader/cache/CachedResourceLoader.cpp: (WebCore::createResource): (WebCore::CachedResourceLoader::requestScript): (WebCore::contentTypeFromResourceType): (WebCore::CachedResourceLoader::checkInsecureContent const): (WebCore::CachedResourceLoader::allowedByContentSecurityPolicy const): (WebCore::destinationForType): (WebCore::CachedResourceLoader::requestResource): (WebCore::CachedResourceLoader::preload): * Source/WebCore/loader/cache/CachedResourceRequest.cpp: (WebCore::CachedResourceRequest::acceptHeaderValueFromType): * Source/WebCore/loader/cache/CachedScript.cpp: (WebCore::CachedScript::CachedScript): * Source/WebCore/loader/cache/CachedScript.h: (isType): * Source/WebCore/loader/cache/MemoryCache.cpp: (WebCore::MemoryCache::getStatistics): * Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp: (WebKit::NetworkLoadChecker::isAllowedByContentSecurityPolicy): * Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::resourceLoadInfo): * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::maximumBufferingTime): Canonical link: https://commits.webkit.org/298595@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