system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Make value_id_from_string() return Optional

Browse source
This commit is contained in:
Sam Atkins 2023-05-10 12:43:29 +01:00 committed by Andreas Kling
parent 9b61f79eae
commit 03613dc14d
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp
View file

@ -67,7 +67,7 @@ enum class ValueID {
generator.append(R"~~~( generator.append(R"~~~(
}; };
ValueID value_id_from_string(StringView); Optional<ValueID> value_id_from_string(StringView);
StringView string_from_value_id(ValueID); StringView string_from_value_id(ValueID);
} }
@ -105,10 +105,9 @@ HashMap<StringView, ValueID, AK::CaseInsensitiveASCIIStringViewTraits> g_stringv
generator.append(R"~~~( generator.append(R"~~~(
}; };
ValueID value_id_from_string(StringView string) Optional<ValueID> value_id_from_string(StringView string)
{ {
auto maybe_value_id = g_stringview_to_value_id_map.get(string); return g_stringview_to_value_id_map.get(string);
return maybe_value_id.value_or(ValueID::Invalid);
} }
StringView string_from_value_id(ValueID value_id) { StringView string_from_value_id(ValueID value_id) {

16
Tests/LibWeb/TestCSSIDSpeed.cpp
View file

@ -10,18 +10,18 @@
TEST_CASE(basic) TEST_CASE(basic)
{ {
EXPECT_EQ(Web::CSS::value_id_from_string("italic"sv), Web::CSS::ValueID::Italic); EXPECT_EQ(Web::CSS::value_id_from_string("italic"sv).value(), Web::CSS::ValueID::Italic);
EXPECT_EQ(Web::CSS::value_id_from_string("inline"sv), Web::CSS::ValueID::Inline); EXPECT_EQ(Web::CSS::value_id_from_string("inline"sv).value(), Web::CSS::ValueID::Inline);
EXPECT_EQ(Web::CSS::value_id_from_string("small"sv), Web::CSS::ValueID::Small); EXPECT_EQ(Web::CSS::value_id_from_string("small"sv).value(), Web::CSS::ValueID::Small);
EXPECT_EQ(Web::CSS::value_id_from_string("smalL"sv), Web::CSS::ValueID::Small); EXPECT_EQ(Web::CSS::value_id_from_string("smalL"sv).value(), Web::CSS::ValueID::Small);
EXPECT_EQ(Web::CSS::value_id_from_string("SMALL"sv), Web::CSS::ValueID::Small); EXPECT_EQ(Web::CSS::value_id_from_string("SMALL"sv).value(), Web::CSS::ValueID::Small);
EXPECT_EQ(Web::CSS::value_id_from_string("Small"sv), Web::CSS::ValueID::Small); EXPECT_EQ(Web::CSS::value_id_from_string("Small"sv).value(), Web::CSS::ValueID::Small);
EXPECT_EQ(Web::CSS::value_id_from_string("smALl"sv), Web::CSS::ValueID::Small); EXPECT_EQ(Web::CSS::value_id_from_string("smALl"sv).value(), Web::CSS::ValueID::Small);
} }
BENCHMARK_CASE(value_id_from_string) BENCHMARK_CASE(value_id_from_string)
{ {
for (size_t i = 0; i < 10'000'000; ++i) { for (size_t i = 0; i < 10'000'000; ++i) {
EXPECT_EQ(Web::CSS::value_id_from_string("inline"sv), Web::CSS::ValueID::Inline); EXPECT_EQ(Web::CSS::value_id_from_string("inline"sv).value(), Web::CSS::ValueID::Inline);
} }
} }

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

@ -1260,9 +1260,9 @@ Optional<MediaFeatureValue> Parser::parse_media_feature_value(MediaFeatureID med
auto transaction = tokens.begin_transaction(); auto transaction = tokens.begin_transaction();
tokens.skip_whitespace(); tokens.skip_whitespace();
auto ident = value_id_from_string(tokens.next_token().token().ident()); auto ident = value_id_from_string(tokens.next_token().token().ident());
if (ident != ValueID::Invalid && media_feature_accepts_identifier(media_feature, ident)) { if (ident.has_value() && media_feature_accepts_identifier(media_feature, ident.value())) {
transaction.commit(); transaction.commit();
return MediaFeatureValue(ident); return MediaFeatureValue(ident.value());
} }
} }
@ -3720,8 +3720,8 @@ ErrorOr<RefPtr<StyleValue>> Parser::parse_identifier_value(ComponentValue const&
{ {
if (component_value.is(Token::Type::Ident)) { if (component_value.is(Token::Type::Ident)) {
auto value_id = value_id_from_string(component_value.token().ident()); auto value_id = value_id_from_string(component_value.token().ident());
if (value_id != ValueID::Invalid) if (value_id.has_value())
return IdentifierStyleValue::create(value_id); return IdentifierStyleValue::create(value_id.value());
} }
return nullptr; return nullptr;
@ -5653,7 +5653,7 @@ CSSRule* Parser::parse_font_face_rule(TokenStream<ComponentValue>& tokens)
break; break;
} }
auto value_id = value_id_from_string(part.token().ident()); auto value_id = value_id_from_string(part.token().ident());
if (is_generic_font_family(value_id)) { if (value_id.has_value() && is_generic_font_family(value_id.value())) {
dbgln_if(CSS_PARSER_DEBUG, "CSSParser: @font-face font-family format invalid; discarding."); dbgln_if(CSS_PARSER_DEBUG, "CSSParser: @font-face font-family format invalid; discarding.");
had_syntax_error = true; had_syntax_error = true;
break; break;