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

LibWeb: Avoid calling FlyString::from_utf8 on FlyString's

Browse source
This commit is contained in:
Shannon Booth 2023-12-10 16:18:26 +13:00 • committed by Andreas Kling
parent 5f2f26451d
commit 74b6e7b1f0
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -421,7 +421,7 @@ NonnullRefPtr<Rule> Parser::consume_an_at_rule(TokenStream<T>& tokens)
// Create a new at-rule with its name set to the value of the current input token, its prelude initially set to an empty list, and its value initially set to nothing. // Create a new at-rule with its name set to the value of the current input token, its prelude initially set to an empty list, and its value initially set to nothing.
// NOTE: We create the Rule fully initialized when we return it instead. // NOTE: We create the Rule fully initialized when we return it instead.
auto at_rule_name = FlyString::from_utf8(((Token)name_ident).at_keyword()).release_value_but_fixme_should_propagate_errors(); auto at_rule_name = ((Token)name_ident).at_keyword();
Vector<ComponentValue> prelude; Vector<ComponentValue> prelude;
RefPtr<Block> block; RefPtr<Block> block;
@ -704,7 +704,7 @@ NonnullRefPtr<Function> Parser::consume_a_function(TokenStream<T>& tokens)
// Create a function with its name equal to the value of the current input token // Create a function with its name equal to the value of the current input token
// and with its value initially set to an empty list. // and with its value initially set to an empty list.
// NOTE: We create the Function fully initialized when we return it instead. // NOTE: We create the Function fully initialized when we return it instead.
auto function_name = FlyString::from_utf8(((Token)name_ident).function()).release_value_but_fixme_should_propagate_errors(); auto function_name = ((Token)name_ident).function();
Vector<ComponentValue> function_values; Vector<ComponentValue> function_values;
// Repeatedly consume the next input token and process it as follows: // Repeatedly consume the next input token and process it as follows:
@ -759,7 +759,7 @@ Optional<Declaration> Parser::consume_a_declaration(TokenStream<T>& tokens)
// Create a new declaration with its name set to the value of the current input token // Create a new declaration with its name set to the value of the current input token
// and its value initially set to the empty list. // and its value initially set to the empty list.
// NOTE: We create a fully-initialized Declaration just before returning it instead. // NOTE: We create a fully-initialized Declaration just before returning it instead.
auto declaration_name = FlyString::from_utf8(((Token)token).ident()).release_value_but_fixme_should_propagate_errors(); auto declaration_name = ((Token)token).ident();
Vector<ComponentValue> declaration_values; Vector<ComponentValue> declaration_values;
Important declaration_important = Important::No; Important declaration_important = Important::No;
@ -6064,7 +6064,7 @@ Optional<Parser::PropertyAndValue> Parser::parse_css_value_for_properties(Readon
// Custom idents // Custom idents
if (auto property = any_property_accepts_type(property_ids, ValueType::CustomIdent); property.has_value()) { if (auto property = any_property_accepts_type(property_ids, ValueType::CustomIdent); property.has_value()) {
(void)tokens.next_token(); (void)tokens.next_token();
return PropertyAndValue { *property, CustomIdentStyleValue::create(MUST(FlyString::from_utf8(peek_token.token().ident()))) }; return PropertyAndValue { *property, CustomIdentStyleValue::create(peek_token.token().ident()) };
} }
} }
@ -6726,7 +6726,7 @@ bool Parser::expand_variables(DOM::Element& element, Optional<Selector::PseudoEl
TokenStream source_function_contents { source_function.values() }; TokenStream source_function_contents { source_function.values() };
if (!expand_variables(element, pseudo_element, property_name, dependencies, source_function_contents, function_values)) if (!expand_variables(element, pseudo_element, property_name, dependencies, source_function_contents, function_values))
return false; return false;
NonnullRefPtr<Function> function = Function::create(FlyString::from_utf8(source_function.name()).release_value_but_fixme_should_propagate_errors(), move(function_values)); NonnullRefPtr<Function> function = Function::create(source_function.name(), move(function_values));
dest.empend(function); dest.empend(function);
continue; continue;
} }
@ -6748,13 +6748,13 @@ bool Parser::expand_variables(DOM::Element& element, Optional<Selector::PseudoEl
// but rebuilding it every time. // but rebuilding it every time.
if (custom_property_name == property_name) if (custom_property_name == property_name)
return false; return false;
auto parent = get_dependency_node(FlyString::from_utf8(property_name).release_value_but_fixme_should_propagate_errors()); auto parent = get_dependency_node(MUST(FlyString::from_utf8(property_name)));
auto child = get_dependency_node(FlyString::from_utf8(custom_property_name).release_value_but_fixme_should_propagate_errors()); auto child = get_dependency_node(custom_property_name);
parent->add_child(child); parent->add_child(child);
if (parent->has_cycles()) if (parent->has_cycles())
return false; return false;
if (auto custom_property_value = get_custom_property(element, pseudo_element, FlyString::from_utf8(custom_property_name).release_value_but_fixme_should_propagate_errors())) { if (auto custom_property_value = get_custom_property(element, pseudo_element, custom_property_name)) {
VERIFY(custom_property_value->is_unresolved()); VERIFY(custom_property_value->is_unresolved());
TokenStream custom_property_tokens { custom_property_value->as_unresolved().values() }; TokenStream custom_property_tokens { custom_property_value->as_unresolved().values() };
if (!expand_variables(element, pseudo_element, custom_property_name, dependencies, custom_property_tokens, dest)) if (!expand_variables(element, pseudo_element, custom_property_name, dependencies, custom_property_tokens, dest))
@ -6867,7 +6867,7 @@ bool Parser::substitute_attr_function(DOM::Element& element, StringView property
// - Attribute type (optional) // - Attribute type (optional)
auto attribute_type = "string"_fly_string; auto attribute_type = "string"_fly_string;
if (attr_contents.peek_token().is(Token::Type::Ident)) { if (attr_contents.peek_token().is(Token::Type::Ident)) {
attribute_type = MUST(FlyString::from_utf8(attr_contents.next_token().token().ident())); attribute_type = attr_contents.next_token().token().ident();
attr_contents.skip_whitespace(); attr_contents.skip_whitespace();
} }

18
Userland/Libraries/LibWeb/CSS/Parser/SelectorParsing.cpp
View file

@ -142,8 +142,8 @@ Optional<Selector::SimpleSelector::QualifiedName> Parser::parse_selector_qualifi
}; };
auto get_name = [](ComponentValue const& token) { auto get_name = [](ComponentValue const& token) {
if (token.is_delim('*')) if (token.is_delim('*'))
return FlyString::from_utf8("*"sv); return "*"_fly_string;
return FlyString::from_utf8(token.token().ident()); return token.token().ident();
}; };
// There are 3 possibilities here: // There are 3 possibilities here:
@ -167,7 +167,7 @@ Optional<Selector::SimpleSelector::QualifiedName> Parser::parse_selector_qualifi
transaction.commit(); transaction.commit();
return Selector::SimpleSelector::QualifiedName { return Selector::SimpleSelector::QualifiedName {
.namespace_type = Selector::SimpleSelector::QualifiedName::NamespaceType::None, .namespace_type = Selector::SimpleSelector::QualifiedName::NamespaceType::None,
.name = get_name(name_token).release_value_but_fixme_should_propagate_errors(), .name = get_name(name_token),
}; };
} }
return {}; return {};
@ -179,8 +179,8 @@ Optional<Selector::SimpleSelector::QualifiedName> Parser::parse_selector_qualifi
if (tokens.peek_token().is_delim('|') && is_name(tokens.peek_token(1))) { if (tokens.peek_token().is_delim('|') && is_name(tokens.peek_token(1))) {
// Case 2: `<namespace>|<name>` // Case 2: `<namespace>|<name>`
(void)tokens.next_token(); // `|` (void)tokens.next_token(); // `|`
auto namespace_ = get_name(first_token).release_value_but_fixme_should_propagate_errors(); auto namespace_ = get_name(first_token);
auto name = get_name(tokens.next_token()).release_value_but_fixme_should_propagate_errors(); auto name = get_name(tokens.next_token());
if (allow_wildcard_name == AllowWildcardName::No && name == "*"sv) if (allow_wildcard_name == AllowWildcardName::No && name == "*"sv)
return {}; return {};
@ -205,7 +205,7 @@ Optional<Selector::SimpleSelector::QualifiedName> Parser::parse_selector_qualifi
transaction.commit(); transaction.commit();
return Selector::SimpleSelector::QualifiedName { return Selector::SimpleSelector::QualifiedName {
.namespace_type = Selector::SimpleSelector::QualifiedName::NamespaceType::Default, .namespace_type = Selector::SimpleSelector::QualifiedName::NamespaceType::Default,
.name = get_name(name_token).release_value_but_fixme_should_propagate_errors(), .name = get_name(name_token),
}; };
} }
@ -550,7 +550,7 @@ Parser::ParseErrorOr<Selector::SimpleSelector> Parser::parse_pseudo_simple_selec
} }
auto language_string = language_token.is(Token::Type::String) ? language_token.token().string() : language_token.token().ident(); auto language_string = language_token.is(Token::Type::String) ? language_token.token().string() : language_token.token().ident();
languages.append(MUST(FlyString::from_utf8(language_string))); languages.append(language_string);
language_token_stream.skip_whitespace(); language_token_stream.skip_whitespace();
if (language_token_stream.has_next_token()) { if (language_token_stream.has_next_token()) {
@ -629,7 +629,7 @@ Parser::ParseErrorOr<Optional<Selector::SimpleSelector>> Parser::parse_simple_se
} }
return Selector::SimpleSelector { return Selector::SimpleSelector {
.type = Selector::SimpleSelector::Type::Class, .type = Selector::SimpleSelector::Type::Class,
.value = Selector::SimpleSelector::Name { FlyString::from_utf8(class_name_value.token().ident()).release_value_but_fixme_should_propagate_errors() } .value = Selector::SimpleSelector::Name { class_name_value.token().ident() }
}; };
} }
case '>': case '>':
@ -653,7 +653,7 @@ Parser::ParseErrorOr<Optional<Selector::SimpleSelector>> Parser::parse_simple_se
} }
return Selector::SimpleSelector { return Selector::SimpleSelector {
.type = Selector::SimpleSelector::Type::Id, .type = Selector::SimpleSelector::Type::Id,
.value = Selector::SimpleSelector::Name { FlyString::from_utf8(first_value.token().hash_value()).release_value_but_fixme_should_propagate_errors() } .value = Selector::SimpleSelector::Name { first_value.token().hash_value() }
}; };
} }