diff --git a/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt b/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt new file mode 100644 index 0000000000..1769f5d796 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt @@ -0,0 +1,7 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x125.179687 children: not-inline + BlockContainer at (8,8) content-size 784x109.179687 children: inline + line 0 width: 275.292968, height: 109.179687, bottom: 109.179687, baseline: 84.570312 + frag 0 from TextNode start: 0, length: 5, rect: [8,8 275.292968x109.179687] + "Crazy" + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.css b/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.css new file mode 100644 index 0000000000..fe93702aae --- /dev/null +++ b/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.css @@ -0,0 +1,5 @@ +@media screen { + body { + font-size: 100px; + } +} diff --git a/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.html b/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.html new file mode 100644 index 0000000000..7cf047ffe4 --- /dev/null +++ b/Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.html @@ -0,0 +1,7 @@ + +Crazy diff --git a/Userland/Libraries/LibWeb/CSS/CSSImportRule.h b/Userland/Libraries/LibWeb/CSS/CSSImportRule.h index caf436c90a..03df9a6e96 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSImportRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSImportRule.h @@ -29,7 +29,6 @@ public: // FIXME: This should return only the specified part of the url. eg, "stuff/foo.css", not "https://example.com/stuff/foo.css". DeprecatedString href() const { return m_url.to_deprecated_string(); } - bool has_import_result() const { return !m_style_sheet; } CSSStyleSheet* loaded_style_sheet() { return m_style_sheet; } CSSStyleSheet const* loaded_style_sheet() const { return m_style_sheet; } CSSStyleSheet* style_sheet_for_bindings() { return m_style_sheet; } diff --git a/Userland/Libraries/LibWeb/CSS/CSSRuleList.cpp b/Userland/Libraries/LibWeb/CSS/CSSRuleList.cpp index 8b26140d2b..27c3e5335f 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSRuleList.cpp +++ b/Userland/Libraries/LibWeb/CSS/CSSRuleList.cpp @@ -128,7 +128,7 @@ void CSSRuleList::for_each_effective_style_rule(Function(*rule); - if (import_rule.has_import_result() && import_rule.loaded_style_sheet()) + if (import_rule.loaded_style_sheet()) import_rule.loaded_style_sheet()->for_each_effective_style_rule(callback); break; } @@ -155,7 +155,7 @@ bool CSSRuleList::evaluate_media_queries(HTML::Window const& window) break; case CSSRule::Type::Import: { auto& import_rule = verify_cast(*rule); - if (import_rule.has_import_result() && import_rule.loaded_style_sheet() && import_rule.loaded_style_sheet()->evaluate_media_queries(window)) + if (import_rule.loaded_style_sheet() && import_rule.loaded_style_sheet()->evaluate_media_queries(window)) any_media_queries_changed_match_state = true; break; } diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index dcc9cabff3..8e05bf58db 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -162,19 +162,6 @@ static CSSStyleSheet& quirks_mode_stylesheet(DOM::Document const& document) return *sheet; } -static void collect_style_sheets(CSSStyleSheet const& sheet, Vector>& sheets) -{ - sheets.append(sheet); - for (auto const& rule : sheet.rules()) { - if (rule->type() == CSSRule::Type::Import) { - auto const& import_rule = static_cast(*rule); - if (auto const* imported_sheet = import_rule.loaded_style_sheet()) { - collect_style_sheets(*imported_sheet, sheets); - } - } - } -} - template void StyleComputer::for_each_stylesheet(CascadeOrigin cascade_origin, Callback callback) const { @@ -184,10 +171,7 @@ void StyleComputer::for_each_stylesheet(CascadeOrigin cascade_origin, Callback c callback(quirks_mode_stylesheet(document())); } if (cascade_origin == CascadeOrigin::Author) { - Vector> sheets; for (auto const& sheet : document().style_sheets().sheets()) - collect_style_sheets(sheet, sheets); - for (auto const& sheet : sheets) callback(*sheet); } }