Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: c81d6b6e4ae114456d148ff231fca1f92d720565
https://github.com/WebKit/WebKit/commit/c81d6b6e4ae114456d148ff231fca1f92d720565
Author: Chris Dumez <[email protected]>
Date: 2026-04-21 (Tue, 21 Apr 2026)
Changed paths:
A LayoutTests/http/tests/preload/css-import-base-tag-expected.txt
A LayoutTests/http/tests/preload/css-import-base-tag.html
A LayoutTests/http/tests/preload/resources/base-tag-import.css
M Source/WebCore/html/parser/CSSPreloadScanner.cpp
M Source/WebCore/html/parser/CSSPreloadScanner.h
M Source/WebCore/html/parser/HTMLPreloadScanner.cpp
Log Message:
-----------
CSS preload scanner should resolve relative @import URLs against the base
element URL
https://bugs.webkit.org/show_bug.cgi?id=312880
Reviewed by Anne van Kesteren.
The HTMLPreloadScanner already tracks the predicted base element URL
from <base> tags and passes it when creating preload requests for
images, scripts, and stylesheets. However, the CSSPreloadScanner was
not receiving this URL, so relative @import URLs were resolved against
an empty base URL. This fell back to document.baseURL() which may not
yet reflect <base> tags the preload scanner has already seen, since the
main parser runs behind the preload scanner.
Fix this by passing m_predictedBaseElementURL through to
CSSPreloadScanner::scan() and using it when creating PreloadRequests
for @import rules.
Test: http/tests/preload/css-import-base-tag.html
* LayoutTests/http/tests/preload/css-import-base-tag-expected.txt: Added.
* LayoutTests/http/tests/preload/css-import-base-tag.html: Added.
* LayoutTests/http/tests/preload/resources/base-tag-import.css: Added.
(body):
* Source/WebCore/html/parser/CSSPreloadScanner.cpp:
(WebCore::CSSPreloadScanner::scan):
(WebCore::CSSPreloadScanner::emitRule):
* Source/WebCore/html/parser/CSSPreloadScanner.h:
* Source/WebCore/html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::scan):
Canonical link: https://commits.webkit.org/311744@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
