eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-26 01:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Eliminate duplicate quirks mode origin check in stylesheet loader (#40646)

Browse Source 
This was due to the fact that two PRs doing this landed around the same
time. This PR eliminates the duplicate check.

Testing: This should not change behavior so is covered by existing
tests.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson
2025-11-15 12:41:30 +01:00
committed by GitHub
parent 1ec01cc25d
commit 7d9017a97b
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/script/stylesheet_loader.rs
View File

@@ -326,31 +326,19 @@ impl FetchResponseListener for StylesheetContext {
let element = self.element.root();
let document = self.document.root();
let mut is_css =
let is_css =
metadata.content_type.clone().is_some_and(|content_type| {
MimeClassifier::is_css(&content_type.into_inner().into())
}) || (
// Quirk: If the document has been set to quirks mode,
// has the same origin as the URL of the external resource,
// and the Content-Type metadata of the external resource
// is not a supported style sheet type, the user agent must
// instead assume it to be text/css.
// <https://html.spec.whatwg.org/multipage/#link-type-stylesheet>
// From <https://html.spec.whatwg.org/multipage/#link-type-stylesheet>:
// > Quirk: If the document has been set to quirks mode, has the same origin as
// > the URL of the external resource, and the Content-Type metadata of the
// > external resource is not a supported style sheet type, the user agent must
// > instead assume it to be text/css.
document.quirks_mode() == QuirksMode::Quirks &&
document.origin().immutable().clone() == metadata.final_url.origin()
);
// From <https://html.spec.whatwg.org/multipage/#link-type-stylesheet>:
// > Quirk: If the document has been set to quirks mode, has the same origin as
// > the URL of the external resource, and the Content-Type metadata of the
// > external resource is not a supported style sheet type, the user agent must
// > instead assume it to be text/css.
if document.quirks_mode() == QuirksMode::Quirks &&
document.url().origin() == self.url.origin()
{
is_css = true;
}
self.unminify_css(metadata.final_url.clone());
if !is_css {
self.data.clear();