Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 0a3f97aeb64690f0557188d2a8447ce1a4907a46
https://github.com/WebKit/WebKit/commit/0a3f97aeb64690f0557188d2a8447ce1a4907a46
Author: Alex Christensen <[email protected]>
Date: 2026-06-08 (Mon, 08 Jun 2026)
Changed paths:
M
LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt
M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html
M
LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml-expected.txt
M LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml.html
M
LayoutTests/fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent.html
M LayoutTests/fast/dom/HTMLLinkElement/link-and-subresource-test.html
M LayoutTests/fast/dom/HTMLLinkElement/prefetch.html
M LayoutTests/fast/dom/HTMLLinkElement/subresource.html
M LayoutTests/fast/dom/HTMLScriptElement/dont-load-unknown-type-expected.txt
M LayoutTests/fast/dom/HTMLScriptElement/dont-load-unknown-type.html
M
LayoutTests/fast/hidpi/image-srcset-change-dynamically-from-js-2x-expected.txt
M LayoutTests/fast/hidpi/image-srcset-change-dynamically-from-js-2x.html
M LayoutTests/fast/preloader/document-write-2.html
M LayoutTests/fast/preloader/document-write-noscript-expected.txt
M LayoutTests/fast/preloader/document-write-noscript.html
M LayoutTests/fast/preloader/document-write.html
M LayoutTests/fast/preloader/first-base-tag-scanned-wins-expected.txt
M LayoutTests/fast/preloader/first-base-tag-scanned-wins.html
M LayoutTests/fast/preloader/first-base-tag-wins-expected.txt
M LayoutTests/fast/preloader/first-base-tag-wins.html
M LayoutTests/fast/preloader/image-expected.txt
M LayoutTests/fast/preloader/image-in-nested-template-01-expected.txt
M LayoutTests/fast/preloader/image-in-nested-template-01.html
M LayoutTests/fast/preloader/image-in-nested-template-expected.txt
M LayoutTests/fast/preloader/image-in-nested-template.html
M LayoutTests/fast/preloader/image-srcset-expected.txt
M LayoutTests/fast/preloader/image-srcset.html
M LayoutTests/fast/preloader/image-with-incorrect-tag-expected.txt
M LayoutTests/fast/preloader/image-with-incorrect-tag.html
M LayoutTests/fast/preloader/image.html
M LayoutTests/fast/preloader/input-expected.txt
M LayoutTests/fast/preloader/input.html
M LayoutTests/fast/preloader/link-expected.txt
M LayoutTests/fast/preloader/link.html
M LayoutTests/fast/preloader/noscript-expected.txt
M LayoutTests/fast/preloader/noscript.html
M LayoutTests/fast/preloader/script.html
M LayoutTests/fast/preloader/style-expected.txt
M LayoutTests/fast/preloader/style.html
M LayoutTests/fast/preloader/understands-base-tag-expected.txt
M LayoutTests/fast/preloader/understands-base-tag.html
M LayoutTests/http/tests/loading/preload-slow-loading-expected.txt
M LayoutTests/http/tests/loading/preload-slow-loading.py
M LayoutTests/http/tests/mime/html-with-html-expected.txt
M LayoutTests/http/tests/mime/html-with-html.html
M LayoutTests/http/tests/mime/html-with-nosniff-html-expected.txt
M LayoutTests/http/tests/mime/html-with-nosniff-html.html
M LayoutTests/http/tests/mime/mime-type-sniff-expected.txt
M LayoutTests/http/tests/mime/mime-type-sniff.html
M LayoutTests/http/tests/mime/svg-with-html-expected.txt
M LayoutTests/http/tests/mime/svg-with-html.html
M LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt
M LayoutTests/http/tests/mime/uppercase-mime-type.html
M LayoutTests/http/tests/mime/xhtml-with-html-expected.txt
M
LayoutTests/http/tests/mime/xhtml-with-html-with-content-disposition-expected.txt
M LayoutTests/http/tests/mime/xhtml-with-html-with-content-disposition.html
M LayoutTests/http/tests/mime/xhtml-with-html.html
M LayoutTests/http/tests/mime/xml-with-html-expected.txt
M LayoutTests/http/tests/mime/xml-with-html.html
M LayoutTests/http/tests/misc/prefetch-purpose.html
M
LayoutTests/http/tests/workers/service/service-worker-download-octet-stream-nosniff.https-expected.txt
M
LayoutTests/http/tests/workers/service/service-worker-download-octet-stream-nosniff.https.html
M LayoutTests/platform/glib/fast/preloader/document-write-expected.txt
M LayoutTests/platform/glib/fast/preloader/script-expected.txt
M
LayoutTests/platform/glib/http/tests/mime/html-with-nosniff-html-expected.txt
A
LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt
A
LayoutTests/platform/ios/fast/hidpi/image-srcset-change-dynamically-from-js-2x-expected.txt
M LayoutTests/platform/ios/fast/preloader/script-expected.txt
M LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
M LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html
M LayoutTests/platform/mac/fast/loader/file-url-mimetypes-expected.txt
M LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html
M LayoutTests/platform/mac/fast/preloader/document-write-2-expected.txt
M LayoutTests/platform/mac/fast/preloader/document-write-expected.txt
M LayoutTests/platform/mac/fast/preloader/script-expected.txt
M
LayoutTests/platform/mac/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
M
LayoutTests/platform/mac/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
A
LayoutTests/platform/win/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt
A
LayoutTests/platform/win/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml-expected.txt
M Tools/DumpRenderTree/TestOptions.cpp
M Tools/DumpRenderTree/TestOptions.h
M Tools/DumpRenderTree/TestRunner.cpp
M Tools/DumpRenderTree/TestRunner.h
M Tools/DumpRenderTree/mac/DumpRenderTree.mm
M Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm
M Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
M Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
M Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
M Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
M Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm
M Tools/WebKitTestRunner/TestController.cpp
M Tools/WebKitTestRunner/TestController.h
M Tools/WebKitTestRunner/TestInvocation.cpp
M Tools/WebKitTestRunner/TestOptions.cpp
M Tools/WebKitTestRunner/TestOptions.h
M Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
Log Message:
-----------
Make testRunner.dumpResourceResponseMIMETypes able to work with site isolation
https://bugs.webkit.org/show_bug.cgi?id=315594
rdar://177977811
Reviewed by Sihui Liu.
This is the next step from what I started in 313704@main. Enabling the dumping
of loading-related things is better done with a webkit-test-runner directive at
the top of the test so we can get the logs from the network process instead of
the web process, which works better when there are multiple web processes. This
makes it so that we see the MIME type of the html file and the subresources
loaded
early in the test, but that's fine. The test coverage is still there.
Two tests starting with platform/mac/platform/mac/fast/loader/file-url-mimetypes
had relatively large changes of MIME types to application/octet-stream. Those
tests have been failing for many years, and this test expectation change
reflects
reality and is not related to the WebKitTestRunner change.
To make the tests more deterministic, especially in stress mode, I clear the
disk
cache between test runs. That's needed so that everything still loads from the
network in ways that are logged now. I also made it so you can dump all mime
types
with a star or just a list of files.
*
LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt:
* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html:
*
LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml-expected.txt:
* LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml.html:
*
LayoutTests/fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent.html:
* LayoutTests/fast/dom/HTMLLinkElement/link-and-subresource-test.html:
* LayoutTests/fast/dom/HTMLLinkElement/prefetch.html:
* LayoutTests/fast/dom/HTMLLinkElement/subresource.html:
* LayoutTests/fast/dom/HTMLScriptElement/dont-load-unknown-type-expected.txt:
* LayoutTests/fast/dom/HTMLScriptElement/dont-load-unknown-type.html:
*
LayoutTests/fast/hidpi/image-srcset-change-dynamically-from-js-2x-expected.txt:
* LayoutTests/fast/hidpi/image-srcset-change-dynamically-from-js-2x.html:
* LayoutTests/fast/preloader/document-write-2.html:
* LayoutTests/fast/preloader/document-write-noscript-expected.txt:
* LayoutTests/fast/preloader/document-write-noscript.html:
* LayoutTests/fast/preloader/document-write.html:
* LayoutTests/fast/preloader/first-base-tag-scanned-wins-expected.txt:
* LayoutTests/fast/preloader/first-base-tag-scanned-wins.html:
* LayoutTests/fast/preloader/first-base-tag-wins-expected.txt:
* LayoutTests/fast/preloader/first-base-tag-wins.html:
* LayoutTests/fast/preloader/image-expected.txt:
* LayoutTests/fast/preloader/image-in-nested-template-01-expected.txt:
* LayoutTests/fast/preloader/image-in-nested-template-01.html:
* LayoutTests/fast/preloader/image-in-nested-template-expected.txt:
* LayoutTests/fast/preloader/image-in-nested-template.html:
* LayoutTests/fast/preloader/image-srcset-expected.txt:
* LayoutTests/fast/preloader/image-srcset.html:
* LayoutTests/fast/preloader/image-with-incorrect-tag-expected.txt:
* LayoutTests/fast/preloader/image-with-incorrect-tag.html:
* LayoutTests/fast/preloader/image.html:
* LayoutTests/fast/preloader/input-expected.txt:
* LayoutTests/fast/preloader/input.html:
* LayoutTests/fast/preloader/link-expected.txt:
* LayoutTests/fast/preloader/link.html:
* LayoutTests/fast/preloader/noscript-expected.txt:
* LayoutTests/fast/preloader/noscript.html:
* LayoutTests/fast/preloader/script.html:
* LayoutTests/fast/preloader/style-expected.txt:
* LayoutTests/fast/preloader/style.html:
* LayoutTests/fast/preloader/understands-base-tag-expected.txt:
* LayoutTests/fast/preloader/understands-base-tag.html:
* LayoutTests/http/tests/loading/preload-slow-loading-expected.txt:
* LayoutTests/http/tests/loading/preload-slow-loading.py:
* LayoutTests/http/tests/mime/html-with-html-expected.txt:
* LayoutTests/http/tests/mime/html-with-html.html:
* LayoutTests/http/tests/mime/html-with-nosniff-html-expected.txt:
* LayoutTests/http/tests/mime/html-with-nosniff-html.html:
* LayoutTests/http/tests/mime/mime-type-sniff-expected.txt:
* LayoutTests/http/tests/mime/mime-type-sniff.html:
* LayoutTests/http/tests/mime/svg-with-html-expected.txt:
* LayoutTests/http/tests/mime/svg-with-html.html:
* LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt:
* LayoutTests/http/tests/mime/uppercase-mime-type.html:
* LayoutTests/http/tests/mime/xhtml-with-html-expected.txt:
*
LayoutTests/http/tests/mime/xhtml-with-html-with-content-disposition-expected.txt:
* LayoutTests/http/tests/mime/xhtml-with-html-with-content-disposition.html:
* LayoutTests/http/tests/mime/xhtml-with-html.html:
* LayoutTests/http/tests/mime/xml-with-html-expected.txt:
* LayoutTests/http/tests/mime/xml-with-html.html:
* LayoutTests/http/tests/misc/prefetch-purpose.html:
*
LayoutTests/http/tests/workers/service/service-worker-download-octet-stream-nosniff.https-expected.txt:
*
LayoutTests/http/tests/workers/service/service-worker-download-octet-stream-nosniff.https.html:
* LayoutTests/platform/glib/fast/preloader/document-write-expected.txt:
* LayoutTests/platform/glib/fast/preloader/script-expected.txt:
* LayoutTests/platform/glib/http/tests/mime/html-with-nosniff-html-expected.txt:
*
LayoutTests/platform/ios/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt:
Added.
*
LayoutTests/platform/ios/fast/hidpi/image-srcset-change-dynamically-from-js-2x-expected.txt:
Copied from
LayoutTests/fast/hidpi/image-srcset-change-dynamically-from-js-2x-expected.txt.
* LayoutTests/platform/ios/fast/preloader/script-expected.txt:
* LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html:
* LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html:
* LayoutTests/platform/mac/fast/loader/file-url-mimetypes-expected.txt:
* LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html:
* LayoutTests/platform/mac/fast/preloader/document-write-2-expected.txt:
* LayoutTests/platform/mac/fast/preloader/document-write-expected.txt:
* LayoutTests/platform/mac/fast/preloader/script-expected.txt:
*
LayoutTests/platform/mac/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt:
*
LayoutTests/platform/mac/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt:
*
LayoutTests/platform/win/fast/dom/HTMLImageElement/sizes/image-sizes-js-change-expected.txt:
Added.
*
LayoutTests/platform/win/fast/dom/HTMLImageElement/sizes/image-sizes-js-innerhtml-expected.txt:
Added.
* Tools/DumpRenderTree/TestOptions.cpp:
(WTR::TestOptions::keyTypeMapping):
* Tools/DumpRenderTree/TestOptions.h:
(WTR::TestOptions::resourceResponseMIMETypesToDump const):
* Tools/DumpRenderTree/TestRunner.cpp:
(TestRunner::staticFunctions):
(dumpResourceResponseMIMETypesCallback): Deleted.
* Tools/DumpRenderTree/TestRunner.h:
(TestRunner::resourceResponseMIMETypesToDump const):
(TestRunner::dumpResourceResponseMIMETypes):
(TestRunner::dumpResourceResponseMIMETypes const): Deleted.
(TestRunner::setDumpResourceResponseMIMETypes): Deleted.
* Tools/DumpRenderTree/mac/DumpRenderTree.mm:
(runTest):
* Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm:
(-[ResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
* Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):
(WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame):
(WTR::InjectedBundlePage::didInitiateLoadForResource): Deleted.
(WTR::InjectedBundlePage::didReceiveResponseForResource): Deleted.
(WTR::InjectedBundlePage::didReceiveContentLengthForResource): Deleted.
(WTR::InjectedBundlePage::didFinishLoadForResource): Deleted.
(WTR::InjectedBundlePage::didFailLoadForResource): Deleted.
(WTR::InjectedBundlePage::platformResponseMimeType): Deleted.
* Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
* Tools/WebKitTestRunner/InjectedBundle/TestRunner.h:
(WTR::TestRunner::dumpResourceResponseMIMETypes):
(WTR::TestRunner::resourceResponseMIMETypesToDump const):
(WTR::TestRunner::shouldDumpResourceResponseMIMETypes const): Deleted.
* Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
(WTR::InjectedBundlePage::platformResponseMimeType): Deleted.
* Tools/WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::dumpResourceResponseMIMETypes):
(WTR::TestController::dumpResourceLoadCallbacks):
(WTR::TestController::didSendRequest):
(WTR::TestController::platformResponseMIMEType):
(WTR::TestController::didPerformRedirect):
(WTR::TestController::didReceiveResponse):
(WTR::TestController::didCompleteWithError):
(WTR::TestController::installResourceLoadClient):
* Tools/WebKitTestRunner/TestController.h:
* Tools/WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::invoke):
* Tools/WebKitTestRunner/TestOptions.cpp:
(WTR::TestOptions::defaults):
(WTR::TestOptions::keyTypeMapping):
* Tools/WebKitTestRunner/TestOptions.h:
(WTR::TestOptions::resourceResponseMIMETypesToDump const):
* Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::platformResponseMIMEType):
Canonical link: https://commits.webkit.org/314790@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
