RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 14:05:08 +00:00
Code Issues Activity Actions

LibHTML: Parse descendant relations in CSS selectors

Browse source 
"div p" now generates a Selector with two components where the second
component is a type=TagName, value="p", relation=Descendant.

We still don't handle matching of these, but at least we parse them.
This commit is contained in:
Andreas Kling 2019-10-06 11:05:57 +02:00
parent 847072c2b1
commit 2a266db05b
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Libraries/LibHTML/CSS/Selector.h
View file

@ -18,6 +18,7 @@ public:
enum class Relation { enum class Relation {
None, None,
ImmediateChild, ImmediateChild,
Descendant,
}; };
Relation relation { Relation::None }; Relation relation { Relation::None };

3
Libraries/LibHTML/Dump.cpp
View file

@ -155,6 +155,9 @@ void dump_rule(const StyleRule& rule)
case Selector::Component::Relation::ImmediateChild: case Selector::Component::Relation::ImmediateChild:
relation_description = "{ImmediateChild}"; relation_description = "{ImmediateChild}";
break; break;
case Selector::Component::Relation::Descendant:
relation_description = "{Descendant}";
break;
} }
dbgprintf(" %s:%s %s\n", type_description, component.value.characters(), relation_description); dbgprintf(" %s:%s %s\n", type_description, component.value.characters(), relation_description);
} }

6
Libraries/LibHTML/Parser/CSSParser.cpp
View file

@ -88,7 +88,7 @@ public:
{ {
consume_whitespace(); consume_whitespace();
Selector::Component::Type type; Selector::Component::Type type;
Selector::Component::Relation relation = Selector::Component::Relation::None; Selector::Component::Relation relation = Selector::Component::Relation::Descendant;
if (peek() == '{') if (peek() == '{')
return {}; return {};
@ -149,6 +149,10 @@ public:
break; break;
} }
if (components.is_empty())
return;
components.first().relation = Selector::Component::Relation::None;
current_rule.selectors.append(Selector(move(components))); current_rule.selectors.append(Selector(move(components)));
}; };