dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Evaluate media rules for adopted style sheets

Browse source 
Previously, media rules were not evaluated for adopted style sheets.
This commit is contained in:
Tim Ledbetter 2024-04-28 16:39:26 +01:00 committed by Andreas Kling
parent f4e0c5395a
commit b9f0ea2178
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/css/constructed-style-sheets.txt
View file

@ -1 +1,2 @@
Disabled constructed style sheet applies to document: false
Constructed style sheet with media rules applies to document: true

1
Tests/LibWeb/Text/input/css/constructed-style-sheets.html
View file

@ -16,5 +16,6 @@
}
println(`Disabled constructed style sheet applies to document: ${constructedStyleSheetAppliesToDocument({ disabled: true })}`);
println(`Constructed style sheet with media rules applies to document: ${constructedStyleSheetAppliesToDocument({ media: "screen, print" })}`);
});
</script>

14
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -2562,10 +2562,10 @@ void Document::evaluate_media_rules()
return;
bool any_media_queries_changed_match_state = false;
for (auto& style_sheet : style_sheets().sheets()) {
if (style_sheet->evaluate_media_queries(*window))
for_each_css_style_sheet([&](CSS::CSSStyleSheet& style_sheet) {
if (style_sheet.evaluate_media_queries(*window))
any_media_queries_changed_match_state = true;
}
});
if (any_media_queries_changed_match_state) {
style_computer().invalidate_rule_cache();
@ -4897,9 +4897,11 @@ WebIDL::ExceptionOr<void> Document::set_adopted_style_sheets(JS::Value new_value
void Document::for_each_css_style_sheet(Function<void(CSS::CSSStyleSheet&)>&& callback) const
{
for (auto& style_sheet : m_style_sheets->sheets()) {
if (!(style_sheet->is_alternate() && style_sheet->disabled()))
callback(*style_sheet);
if (m_style_sheets) {
for (auto& style_sheet : m_style_sheets->sheets()) {
if (!(style_sheet->is_alternate() && style_sheet->disabled()))
callback(*style_sheet);
}
}
if (m_adopted_style_sheets) {