mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 12:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Allow anonymous layer block rule with no declarations

Browse source
This commit is contained in:
Tim Ledbetter 2025-06-17 08:01:49 +01:00 • committed by Sam Atkins
commit 701fcb9e87
Notes: github-actions[bot] 2025-06-17 07:59:15 +00:00
6 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -441,6 +441,7 @@ Optional<AtRule> Parser::consume_an_at_rule(TokenStream<T>& input, Nested nested
.name = ((Token)input.consume_a_token()).at_keyword(),
.prelude = {},
.child_rules_and_lists_of_declarations = {},
.is_block_rule = false,
};
// Process input:
@ -479,6 +480,7 @@ Optional<AtRule> Parser::consume_an_at_rule(TokenStream<T>& input, Nested nested
// Consume a block from input, and assign the result to rule’s child rules.
m_rule_context.append(rule_context_type_for_at_rule(rule.name));
rule.child_rules_and_lists_of_declarations = consume_a_block(input);
rule.is_block_rule = true;
m_rule_context.take_last();
// If rule is valid in the current context, return it. Otherwise, return nothing.

2
Libraries/LibWeb/CSS/Parser/RuleParsing.cpp
View file

@ -288,7 +288,7 @@ Optional<FlyString> Parser::parse_layer_name(TokenStream<ComponentValue>& tokens
GC::Ptr<CSSRule> Parser::convert_to_layer_rule(AtRule const& rule, Nested nested)
{
// https://drafts.csswg.org/css-cascade-5/#at-layer
if (!rule.child_rules_and_lists_of_declarations.is_empty()) {
if (rule.is_block_rule) {
// CSSLayerBlockRule
// @layer <layer-name>? {
// <rule-list>

1
Libraries/LibWeb/CSS/Parser/Types.h
View file

@ -31,6 +31,7 @@ struct AtRule {
FlyString name;
Vector<ComponentValue> prelude;
Vector<RuleOrListOfDeclarations> child_rules_and_lists_of_declarations;
bool is_block_rule { false };
void for_each(AtRuleVisitor&& visit_at_rule, QualifiedRuleVisitor&& visit_qualified_rule, DeclarationVisitor&& visit_declaration) const;
void for_each_as_declaration_list(DeclarationVisitor&& visit) const;

2
Tests/LibWeb/Text/expected/css/CSSRule-type.txt
View file

@ -6,5 +6,5 @@ CSSFontFaceRule type = 5
CSSKeyframesRule type = 7
CSSSupportsRule type = 12
CSSLayerStatementRule type = 0
CSSLayerStatementRule type = 0
CSSLayerBlockRule type = 0
CSSPropertyRule type = 0

21
Tests/LibWeb/Text/expected/wpt-import/css/css-cascade/parsing/layer.txt Normal file
View file

@ -0,0 +1,21 @@
Harness status: OK
Found 11 tests
11 Pass
Pass @layer A; should be a valid rule
Pass @layer A, B, C; should be a valid rule
Pass @layer A.A; should be a valid rule
Pass @layer A, B.C.D, C; should be a valid rule
Pass @layer; should be an invalid rule
Pass @layer A . A; should be an invalid rule
Pass @layer {
} should be a valid rule
Pass @layer A {
} should be a valid rule
Pass @layer A.B {
} should be a valid rule
Pass @layer A . B {
} should be an invalid rule
Pass @layer A, B, C {
} should be an invalid rule

25
Tests/LibWeb/Text/input/wpt-import/css/css-cascade/parsing/layer.html Normal file
View file

@ -0,0 +1,25 @@
<!doctype html>
<meta charset="utf-8">
<title>@layer rule parsing / serialization</title>
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
<link rel="author" title="Mozilla" href="https://mozilla.org">
<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering">
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<script src="../../../css/support/parsing-testcommon.js"></script>
<script>
test_valid_rule("@layer A;");
test_valid_rule("@layer A, B, C;");
test_valid_rule("@layer A.A;");
test_valid_rule("@layer A, B.C.D, C;");
test_invalid_rule("@layer;");
test_invalid_rule("@layer A . A;");
test_valid_rule("@layer {\n}");
test_valid_rule("@layer A {\n}");
test_valid_rule("@layer A.B {\n}");
test_invalid_rule("@layer A . B {\n}");
test_invalid_rule("@layer A, B, C {\n}");
</script>