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

LibWeb: Use the serialize_a_{identifier,string} algorithms for selectors

Browse source 
Also fixed that serializing an attribute selector never output the
value.
This commit is contained in:
Sam Atkins 2021-10-15 12:18:09 +01:00 • committed by Linus Groh
parent d775212f19
commit e72286c0ec
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibWeb/CSS/Selector.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include "Selector.h" #include "Selector.h"
#include <LibWeb/CSS/Serialize.h>
namespace Web::CSS { namespace Web::CSS {
@ -55,8 +56,7 @@ String Selector::SimpleSelector::serialize() const
// FIXME: 2. If the namespace prefix maps to a namespace that is the null namespace (not in a namespace) append "|" (U+007C) to s. // FIXME: 2. If the namespace prefix maps to a namespace that is the null namespace (not in a namespace) append "|" (U+007C) to s.
// 3. If this is a type selector append the serialization of the element name as an identifier to s. // 3. If this is a type selector append the serialization of the element name as an identifier to s.
if (type == Selector::SimpleSelector::Type::TagName) { if (type == Selector::SimpleSelector::Type::TagName) {
// FIXME: Use the "serialize an identifier" algorithm. serialize_an_identifier(s, value);
s.append(value);
} }
// 4. If this is a universal selector append "*" (U+002A) to s. // 4. If this is a universal selector append "*" (U+002A) to s.
if (type == Selector::SimpleSelector::Type::Universal) if (type == Selector::SimpleSelector::Type::Universal)
@ -69,8 +69,7 @@ String Selector::SimpleSelector::serialize() const
// FIXME: 2. If the namespace prefix maps to a namespace that is not the null namespace (not in a namespace) append the serialization of the namespace prefix as an identifier, followed by a "|" (U+007C) to s. // FIXME: 2. If the namespace prefix maps to a namespace that is not the null namespace (not in a namespace) append the serialization of the namespace prefix as an identifier, followed by a "|" (U+007C) to s.
// 3. Append the serialization of the attribute name as an identifier to s. // 3. Append the serialization of the attribute name as an identifier to s.
// FIXME: Use the "serialize an identifier" algorithm. serialize_an_identifier(s, attribute.name);
s.append(attribute.name);
// 4. If there is an attribute value specified, append "=", "~=", "|=", "^=", "$=", or "*=" as appropriate (depending on the type of attribute selector), // 4. If there is an attribute value specified, append "=", "~=", "|=", "^=", "$=", or "*=" as appropriate (depending on the type of attribute selector),
// followed by the serialization of the attribute value as a string, to s. // followed by the serialization of the attribute value as a string, to s.
@ -97,6 +96,8 @@ String Selector::SimpleSelector::serialize() const
default: default:
break; break;
} }
serialize_a_string(s, attribute.value);
} }
// FIXME: 5. If the attribute selector has the case-sensitivity flag present, append " i" (U+0020 U+0069) to s. // FIXME: 5. If the attribute selector has the case-sensitivity flag present, append " i" (U+0020 U+0069) to s.
@ -107,15 +108,13 @@ String Selector::SimpleSelector::serialize() const
case Selector::SimpleSelector::Type::Class: case Selector::SimpleSelector::Type::Class:
// Append a "." (U+002E), followed by the serialization of the class name as an identifier to s. // Append a "." (U+002E), followed by the serialization of the class name as an identifier to s.
s.append('.'); s.append('.');
// FIXME: Use the "serialize an identifier" algorithm. serialize_an_identifier(s, value);
s.append(value);
break; break;
case Selector::SimpleSelector::Type::Id: case Selector::SimpleSelector::Type::Id:
// Append a "#" (U+0023), followed by the serialization of the ID as an identifier to s. // Append a "#" (U+0023), followed by the serialization of the ID as an identifier to s.
s.append('#'); s.append('#');
// FIXME: Use the "serialize an identifier" algorithm. serialize_an_identifier(s, value);
s.append(value);
break; break;
case Selector::SimpleSelector::Type::PseudoClass: case Selector::SimpleSelector::Type::PseudoClass:
@ -149,8 +148,8 @@ String Selector::SimpleSelector::serialize() const
s.append('('); s.append('(');
if (pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::NthChild if (pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::NthChild
|| pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::NthLastChild) { || pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::NthLastChild) {
// FIXME: The result of serializing the value using the rules to serialize an <an+b> value. // The result of serializing the value using the rules to serialize an <an+b> value.
TODO(); s.append(pseudo_class.nth_child_pattern.serialize());
} else if (pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::Not) { } else if (pseudo_class.type == Selector::SimpleSelector::PseudoClass::Type::Not) {
// The result of serializing the value using the rules for serializing a group of selectors. // The result of serializing the value using the rules for serializing a group of selectors.
s.append(serialize_a_group_of_selectors(pseudo_class.not_selector)); s.append(serialize_a_group_of_selectors(pseudo_class.not_selector));

2
Userland/Libraries/LibWeb/CSS/Selector.h
View file

@ -37,7 +37,7 @@ public:
int step_size { 0 }; // "A" int step_size { 0 }; // "A"
int offset = { 0 }; // "B" int offset = { 0 }; // "B"
String to_string() const String serialize() const
{ {
return String::formatted("{}n{:+}", step_size, offset); return String::formatted("{}n{:+}", step_size, offset);
} }