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

LibWeb: Parse multiple font-family values

Browse source 
Apart from now gathering comma-separated font-family names into a
StyleValueList, this also corrects the logic for parsing a single
font-family. Previously, we did not handle unquoted font names at all,
and now they are handled including when they are several words separated
by whitespace.

Modified the logic for `font` to use `parse_font_family_value()`.
`FontStyleValue.font_families()` is now a StyleValueList instead of a
vector, so that it can be better handled in StyleResolver.

We also finally remove the CSS::ParsingContext in
set_property_expanding_shorthands(). :^)
This commit is contained in:
Sam Atkins 2021-08-10 17:01:26 +01:00 • committed by Andreas Kling
parent 75450d2250
commit 678760bd87
4 changed files with 120 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibWeb/CSS/StyleValue.h
View file

@ -855,37 +855,29 @@ private:
class FontStyleValue final : public StyleValue {
public:
static NonnullRefPtr<FontStyleValue> create(NonnullRefPtr<StyleValue> font_style, NonnullRefPtr<StyleValue> font_weight, NonnullRefPtr<StyleValue> font_size, NonnullRefPtr<StyleValue> line_height, NonnullRefPtrVector<StyleValue>&& font_families) { return adopt_ref(*new FontStyleValue(font_style, font_weight, font_size, line_height, move(font_families))); }
static NonnullRefPtr<FontStyleValue> create(NonnullRefPtr<StyleValue> font_style, NonnullRefPtr<StyleValue> font_weight, NonnullRefPtr<StyleValue> font_size, NonnullRefPtr<StyleValue> line_height, NonnullRefPtr<StyleValue> font_families) { return adopt_ref(*new FontStyleValue(font_style, font_weight, font_size, line_height, font_families)); }
virtual ~FontStyleValue() override { }
NonnullRefPtr<StyleValue> font_style() const { return m_font_style; }
NonnullRefPtr<StyleValue> font_weight() const { return m_font_weight; }
NonnullRefPtr<StyleValue> font_size() const { return m_font_size; }
NonnullRefPtr<StyleValue> line_height() const { return m_line_height; }
NonnullRefPtrVector<StyleValue> const& font_families() const { return m_font_families; }
NonnullRefPtr<StyleValue> font_families() const { return m_font_families; }
virtual String to_string() const override
{
StringBuilder string_builder;
string_builder.appendff("Font style: {}, weight: {}, size: {}, line_height: {}, families: [",
m_font_style->to_string(), m_font_weight->to_string(), m_font_size->to_string(), m_line_height->to_string());
for (auto& family : m_font_families) {
string_builder.append(family.to_string());
string_builder.append(",");
}
string_builder.append("]");
return string_builder.to_string();
return String::formatted("Font style: {}, weight: {}, size: {}, line_height: {}, families: {}",
m_font_style->to_string(), m_font_weight->to_string(), m_font_size->to_string(), m_line_height->to_string(), m_font_families->to_string());
}
private:
FontStyleValue(NonnullRefPtr<StyleValue> font_style, NonnullRefPtr<StyleValue> font_weight, NonnullRefPtr<StyleValue> font_size, NonnullRefPtr<StyleValue> line_height, NonnullRefPtrVector<StyleValue>&& font_families)
FontStyleValue(NonnullRefPtr<StyleValue> font_style, NonnullRefPtr<StyleValue> font_weight, NonnullRefPtr<StyleValue> font_size, NonnullRefPtr<StyleValue> line_height, NonnullRefPtr<StyleValue> font_families)
: StyleValue(Type::Font)
, m_font_style(font_style)
, m_font_weight(font_weight)
, m_font_size(font_size)
, m_line_height(line_height)
, m_font_families(move(font_families))
, m_font_families(font_families)
{
}
@ -893,7 +885,7 @@ private:
NonnullRefPtr<StyleValue> m_font_weight;
NonnullRefPtr<StyleValue> m_font_size;
NonnullRefPtr<StyleValue> m_line_height;
NonnullRefPtrVector<StyleValue> m_font_families;
NonnullRefPtr<StyleValue> m_font_families;
// FIXME: Implement font-stretch and font-variant.
};