RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:37:43 +00:00
Code Issues Activity Actions

LibWeb: Actually visit rules and media queries in imported style sheets

Browse source 
Due to CSSImportRule::has_import_result() being backwards, we never
actually entered imported style sheets when traversing style rules or
media queries.

With this fixed, we no longer need the "collect style sheets" step in
StyleComputer, as normal for_each_effective_style_rule() will now
actually find all the rules. :^)
This commit is contained in:
Andreas Kling 2023-03-30 12:08:41 +02:00
parent fe761a4e9b
commit 45f8542965
6 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt Normal file
View file

@ -0,0 +1,7 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x125.179687 children: not-inline
BlockContainer <body> 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>

5
Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.css Normal file
View file

@ -0,0 +1,5 @@
@media screen {
body {
font-size: 100px;
}
}

7
Tests/LibWeb/Layout/input/css-imported-sheet-with-media-rule.html Normal file
View file

@ -0,0 +1,7 @@
<style>
@import "css-imported-sheet-with-media-rule.css";
* {
font-family: 'SerenitySans';
}
</style>
Crazy

1
Userland/Libraries/LibWeb/CSS/CSSImportRule.h
View file

@ -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; }

4
Userland/Libraries/LibWeb/CSS/CSSRuleList.cpp
View file

@ -128,7 +128,7 @@ void CSSRuleList::for_each_effective_style_rule(Function<void(CSSStyleRule const
break;
case CSSRule::Type::Import: {
auto const& import_rule = static_cast<CSSImportRule const&>(*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<CSSImportRule>(*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;
}

16
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -162,19 +162,6 @@ static CSSStyleSheet& quirks_mode_stylesheet(DOM::Document const& document)
return *sheet;
}
static void collect_style_sheets(CSSStyleSheet const& sheet, Vector<JS::NonnullGCPtr<CSSStyleSheet const>>& sheets)
{
sheets.append(sheet);
for (auto const& rule : sheet.rules()) {
if (rule->type() == CSSRule::Type::Import) {
auto const& import_rule = static_cast<CSSImportRule const&>(*rule);
if (auto const* imported_sheet = import_rule.loaded_style_sheet()) {
collect_style_sheets(*imported_sheet, sheets);
}
}
}
}
template<typename Callback>
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<JS::NonnullGCPtr<CSSStyleSheet const>> sheets;
for (auto const& sheet : document().style_sheets().sheets())
collect_style_sheets(sheet, sheets);
for (auto const& sheet : sheets)
callback(*sheet);
}
}