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

LibGfx+LibWeb: Produce font cascade list in CSS font matching algorithm

Browse source 
According to the CSS font matching algorithm specification, it is
supposed to be executed for each glyph instead of each text run, as is
currently done. This change partially implements this by having the
font matching algorithm produce a list of fonts against which each
glyph will be tested to find its suitable font.

Now, it becomes possible to have per-glyph fallback fonts: if the
needed glyph is not present in a font, we can check the subsequent
fonts in the list.
This commit is contained in:
Aliaksandr Kalenik 2023-12-09 23:42:02 +01:00 • committed by Andreas Kling
parent f50bf00814
commit 2cb0039a13
23 changed files with 250 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -143,7 +143,8 @@ public:
bool can_contain_boxes_with_position_absolute() const;
Gfx::Font const& font() const;
Gfx::FontCascadeList const& font_list() const;
Gfx::Font const& first_available_font() const;
Gfx::Font const& scaled_font(PaintContext&) const;
Gfx::Font const& scaled_font(float scale_factor) const;
@ -217,10 +218,11 @@ public:
void apply_style(const CSS::StyleProperties&);
Gfx::Font const& font() const { return *m_font; }
Gfx::Font const& first_available_font() const;
Gfx::FontCascadeList const& font_list() const { return *m_font_list; }
CSSPixels line_height() const { return m_line_height; }
void set_line_height(CSSPixels line_height) { m_line_height = line_height; }
void set_font(Gfx::Font const& font) { m_font = font; }
void set_font_list(Gfx::FontCascadeList const& font_list) { m_font_list = font_list; }
Vector<CSS::BackgroundLayerData> const& background_layers() const { return computed_values().background_layers(); }
const CSS::AbstractImageStyleValue* list_style_image() const { return m_list_style_image; }
@ -238,7 +240,7 @@ private:
void reset_table_box_computed_values_used_by_wrapper_to_init_values();
CSS::ComputedValues m_computed_values;
RefPtr<Gfx::Font const> m_font;
RefPtr<Gfx::FontCascadeList const> m_font_list;
CSSPixels m_line_height { 0 };
RefPtr<CSS::AbstractImageStyleValue const> m_list_style_image;
};
@ -275,13 +277,20 @@ inline bool Node::has_style_or_parent_with_style() const
return m_has_style || (parent() != nullptr && parent()->has_style_or_parent_with_style());
}
inline Gfx::Font const& Node::font() const
inline Gfx::Font const& Node::first_available_font() const
{
VERIFY(has_style_or_parent_with_style());
if (m_has_style)
return static_cast<NodeWithStyle const*>(this)->font();
return parent()->font();
return static_cast<NodeWithStyle const*>(this)->first_available_font();
return parent()->first_available_font();
}
inline Gfx::FontCascadeList const& Node::font_list() const
{
VERIFY(has_style_or_parent_with_style());
if (m_has_style)
return static_cast<NodeWithStyle const*>(this)->font_list();
return parent()->font_list();
}
inline Gfx::Font const& Node::scaled_font(PaintContext& context) const
@ -291,7 +300,7 @@ inline Gfx::Font const& Node::scaled_font(PaintContext& context) const
inline Gfx::Font const& Node::scaled_font(float scale_factor) const
{
return document().style_computer().font_cache().scaled_font(font(), scale_factor);
return document().style_computer().font_cache().scaled_font(first_available_font(), scale_factor);
}
inline const CSS::ImmutableComputedValues& Node::computed_values() const
@ -322,4 +331,12 @@ inline NodeWithStyle* Node::parent()
return static_cast<NodeWithStyle*>(TreeNode<Node>::parent());
}
inline Gfx::Font const& NodeWithStyle::first_available_font() const
{
// https://drafts.csswg.org/css-fonts/#first-available-font
// FIXME: Should be be the first font for which the character U+0020 (space) instead of
// any first font in the list
return m_font_list->first();
}
}