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

LibGfx+LibWeb: Use ref-counted object to store glyph run

Browse source 
...to avoid allocating a copy of glyph run for painting commands. We
can't simply save pointers to a glyph run in layout/paintable tree
because it should be safe to deallocate layout and paintable trees
after painting commands are recorded, if in the future we decide to
move command execution to a separate thread.
This commit is contained in:
Aliaksandr Kalenik 2024-03-01 16:37:44 +01:00 • committed by Andreas Kling
parent cf6999f5f3
commit 06c176bbfb
9 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Painting/Command.h
View file

@ -38,7 +38,7 @@
namespace Web::Painting {
struct DrawGlyphRun {
Vector<Gfx::DrawGlyphOrEmoji> glyph_run;
NonnullRefPtr<Gfx::GlyphRun> glyph_run;
Color color;
Gfx::IntRect rect;
Gfx::FloatPoint translation;

4
Userland/Libraries/LibWeb/Painting/CommandList.cpp
View file

@ -49,7 +49,7 @@ void CommandList::execute(CommandExecutor& executor)
auto& command = command_with_scroll_id.command;
if (command.has<DrawGlyphRun>()) {
auto scale = command.get<DrawGlyphRun>().scale;
for (auto const& glyph_or_emoji : command.get<DrawGlyphRun>().glyph_run) {
for (auto const& glyph_or_emoji : command.get<DrawGlyphRun>().glyph_run->glyphs()) {
if (glyph_or_emoji.has<Gfx::DrawGlyph>()) {
auto const& glyph = glyph_or_emoji.get<Gfx::DrawGlyph>();
auto const& font = *glyph.font->with_size(glyph.font->point_size() * static_cast<float>(scale));
@ -89,7 +89,7 @@ void CommandList::execute(CommandExecutor& executor)
auto result = command.visit(
[&](DrawGlyphRun const& command) {
return executor.draw_glyph_run(command.glyph_run, command.color, command.translation, command.scale);
return executor.draw_glyph_run(command.glyph_run->glyphs(), command.color, command.translation, command.scale);
},
[&](DrawText const& command) {
return executor.draw_text(command.rect, command.raw_text, command.alignment, command.color,

4
Userland/Libraries/LibWeb/Painting/PaintableFragment.h
View file

@ -38,7 +38,7 @@ public:
CSSPixelRect const absolute_rect() const;
Vector<Gfx::DrawGlyphOrEmoji> const& glyph_run() const { return m_glyph_run; }
Gfx::GlyphRun const& glyph_run() const { return *m_glyph_run; }
CSSPixelRect selection_rect(Gfx::Font const&) const;
@ -55,7 +55,7 @@ private:
int m_start;
int m_length;
Painting::BorderRadiiData m_border_radii_data;
Vector<Gfx::DrawGlyphOrEmoji> m_glyph_run;
NonnullRefPtr<Gfx::GlyphRun> m_glyph_run;
Vector<ShadowData> m_shadows;
bool m_contained_by_inline_node { false };
};

4
Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp
View file

@ -206,11 +206,11 @@ void RecordingPainter::draw_signed_distance_field(Gfx::IntRect const& dst_rect,
});
}
void RecordingPainter::draw_text_run(Gfx::IntPoint baseline_start, Span<Gfx::DrawGlyphOrEmoji const> glyph_run, Color color, Gfx::IntRect const& rect, double scale)
void RecordingPainter::draw_text_run(Gfx::IntPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale)
{
auto transformed_baseline_start = state().translation.map(baseline_start).to_type<float>();
append(DrawGlyphRun {
.glyph_run = Vector<Gfx::DrawGlyphOrEmoji> { glyph_run },
.glyph_run = glyph_run,
.color = color,
.rect = state().translation.map(rect),
.translation = transformed_baseline_start,

2
Userland/Libraries/LibWeb/Painting/RecordingPainter.h
View file

@ -100,7 +100,7 @@ public:
void draw_signed_distance_field(Gfx::IntRect const& dst_rect, Color color, Gfx::GrayscaleBitmap const& sdf, float smoothing);
// Streamlined text drawing routine that does no wrapping/elision/alignment.
void draw_text_run(Gfx::IntPoint baseline_start, Span<Gfx::DrawGlyphOrEmoji const> glyph_run, Color color, Gfx::IntRect const& rect, double scale);
void draw_text_run(Gfx::IntPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale);
void add_clip_rect(Gfx::IntRect const& rect);

4
Userland/Libraries/LibWeb/Painting/ShadowPainting.cpp
View file

@ -590,8 +590,8 @@ void paint_text_shadow(PaintContext& context, PaintableFragment const& fragment,
auto fragment_baseline = context.rounded_device_pixels(fragment.baseline()).value();
Vector<Gfx::DrawGlyphOrEmoji> scaled_glyph_run;
scaled_glyph_run.ensure_capacity(fragment.glyph_run().size());
for (auto glyph : fragment.glyph_run()) {
scaled_glyph_run.ensure_capacity(fragment.glyph_run().glyphs().size());
for (auto glyph : fragment.glyph_run().glyphs()) {
glyph.visit([&](auto& glyph) {
glyph.font = *glyph.font->with_size(glyph.font->point_size() * static_cast<float>(context.device_pixels_per_css_pixel()));
glyph.position = glyph.position.scaled(context.device_pixels_per_css_pixel());