Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LibWeb: Improve parsing and serialization of some font properties #3482

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+6,514 −609
Open

LibWeb: Improve parsing and serialization of some font properties #3482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7becbea
LibWeb/CSS: Make `font` implicitly reset some properties
AtkinsSJ Feb 5, 2025
633a255
Tests: Import some font-parsing tests
AtkinsSJ Feb 5, 2025
7b10fa6
LibWeb/CSS: Serialize font property more correctly
AtkinsSJ Feb 5, 2025
9fc9756
LibWeb/CSS: Support nested shorthands in CSSStyleDeclaration
AtkinsSJ Feb 6, 2025
5ed4591
LibWeb/CSS: Reject trailing unparseable tokens in property values
AtkinsSJ Feb 6, 2025
056e825
LibWeb/CSS: Parse font-variant properties closer to spec
AtkinsSJ Feb 6, 2025
86ab513
LibWeb/CSS: Serialize font-variant property closer to spec
AtkinsSJ Feb 6, 2025
2eb8c59
LibWeb/CSS: Inline CSSStyleValue::to_font_variant_foo() methods
AtkinsSJ Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 54 additions & 25 deletions Libraries/LibWeb/CSS/CSSStyleValue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,14 +495,14 @@ Optional<FontVariantCaps> CSSStyleValue::to_font_variant_caps() const

Optional<Gfx::FontVariantEastAsian> CSSStyleValue::to_font_variant_east_asian() const
{
VERIFY(is_value_list());
auto& list = as_value_list();
Gfx::FontVariantEastAsian east_asian {};
for (auto& value : list.values()) {
VERIFY(value->is_keyword());
switch (value->as_keyword().keyword()) {
bool normal = false;

auto apply_keyword = [&east_asian, &normal](Keyword keyword) {
switch (keyword) {
case Keyword::Normal:
return {};
normal = true;
break;
case Keyword::Jis78:
east_asian.variant = Gfx::FontVariantEastAsian::Variant::Jis78;
break;
Expand Down Expand Up @@ -532,9 +532,20 @@ Optional<Gfx::FontVariantEastAsian> CSSStyleValue::to_font_variant_east_asian()
break;
default:
VERIFY_NOT_REACHED();
break;
}
};

if (is_keyword()) {
apply_keyword(to_keyword());
} else if (is_value_list()) {
for (auto& value : as_value_list().values()) {
apply_keyword(value->to_keyword());
}
}

if (normal)
return {};

return east_asian;
}

Expand All @@ -546,21 +557,17 @@ Optional<FontVariantEmoji> CSSStyleValue::to_font_variant_emoji() const

Optional<Gfx::FontVariantLigatures> CSSStyleValue::to_font_variant_ligatures() const
{
if (!is_value_list()) {
return {};
}
auto const& list = as_value_list();
Gfx::FontVariantLigatures ligatures {};
bool normal = false;

for (auto& value : list.values()) {
if (!value->is_keyword())
continue;
switch (value->as_keyword().keyword()) {
auto apply_keyword = [&ligatures, &normal](Keyword keyword) {
switch (keyword) {
case Keyword::Normal:
return {};
normal = true;
break;
case Keyword::None:
ligatures.none = true;
return ligatures;
break;
case Keyword::CommonLigatures:
ligatures.common = Gfx::FontVariantLigatures::Common::Common;
break;
Expand All @@ -587,22 +594,33 @@ Optional<Gfx::FontVariantLigatures> CSSStyleValue::to_font_variant_ligatures() c
break;
default:
VERIFY_NOT_REACHED();
break;
}
};

if (is_keyword()) {
apply_keyword(to_keyword());
} else if (is_value_list()) {
for (auto& value : as_value_list().values()) {
apply_keyword(value->to_keyword());
}
}

if (normal)
return {};

return ligatures;
}

Optional<Gfx::FontVariantNumeric> CSSStyleValue::to_font_variant_numeric() const
{
VERIFY(is_value_list());
auto& list = as_value_list();
Gfx::FontVariantNumeric numeric {};
for (auto& value : list.values()) {
VERIFY(value->is_keyword());
switch (value->as_keyword().keyword()) {
bool normal = false;

auto apply_keyword = [&numeric, &normal](Keyword keyword) {
switch (keyword) {
case Keyword::Normal:
return {};
normal = true;
break;
case Keyword::Ordinal:
numeric.ordinal = true;
break;
Expand All @@ -629,9 +647,20 @@ Optional<Gfx::FontVariantNumeric> CSSStyleValue::to_font_variant_numeric() const
break;
default:
VERIFY_NOT_REACHED();
break;
}
};

if (is_keyword()) {
apply_keyword(to_keyword());
} else if (is_value_list()) {
for (auto& value : as_value_list().values()) {
apply_keyword(value->to_keyword());
}
}

if (normal)
return {};

return numeric;
}

Expand Down
Loading