mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-28 21:26:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Rename draw_text_run to draw_glyph_run in DisplayListRecorder

Browse source 
For consistency with corresponding display list item name.
This commit is contained in:
Aliaksandr Kalenik 2025-07-26 16:31:22 +02:00 • committed by Jelle Raaijmakers
commit 0e8d70d8c3
Notes: github-actions[bot] 2025-07-27 08:21:42 +00:00
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/Painting/BackgroundPainting.cpp
View file

@ -37,7 +37,7 @@ static RefPtr<DisplayList> compute_text_clip_paths(PaintContext& context, Painta
fragment_absolute_rect.x().to_float(), fragment_absolute_rect.x().to_float(),
fragment_absolute_rect.y().to_float() + fragment.baseline().to_float(), fragment_absolute_rect.y().to_float() + fragment.baseline().to_float(),
} * scale; } * scale;
display_list_recorder.draw_text_run(baseline_start, *glyph_run, Gfx::Color::Black, fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation()); display_list_recorder.draw_glyph_run(baseline_start, *glyph_run, Gfx::Color::Black, fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation());
}; };
paintable.for_each_in_inclusive_subtree([&](auto& paintable) { paintable.for_each_in_inclusive_subtree([&](auto& paintable) {

4
Libraries/LibWeb/Painting/DisplayListRecorder.cpp
View file

@ -259,10 +259,10 @@ void DisplayListRecorder::draw_text(Gfx::IntRect const& rect, String raw_text, G
} }
auto metrics = font.pixel_metrics(); auto metrics = font.pixel_metrics();
float baseline_y = static_cast<float>(rect.y()) + metrics.ascent + (static_cast<float>(rect.height()) - (metrics.ascent + metrics.descent)) / 2.0f; float baseline_y = static_cast<float>(rect.y()) + metrics.ascent + (static_cast<float>(rect.height()) - (metrics.ascent + metrics.descent)) / 2.0f;
draw_text_run({ baseline_x, baseline_y }, *glyph_run, color, rect, 1.0, Orientation::Horizontal); draw_glyph_run({ baseline_x, baseline_y }, *glyph_run, color, rect, 1.0, Orientation::Horizontal);
} }
void DisplayListRecorder::draw_text_run(Gfx::FloatPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale, Orientation orientation) void DisplayListRecorder::draw_glyph_run(Gfx::FloatPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale, Orientation orientation)
{ {
if (color.alpha() == 0) if (color.alpha() == 0)
return; return;

2
Libraries/LibWeb/Painting/DisplayListRecorder.h
View file

@ -103,7 +103,7 @@ public:
void draw_text(Gfx::IntRect const&, String, Gfx::Font const&, Gfx::TextAlignment, Color); void draw_text(Gfx::IntRect const&, String, Gfx::Font const&, Gfx::TextAlignment, Color);
// Streamlined text drawing routine that does no wrapping/elision/alignment. // Streamlined text drawing routine that does no wrapping/elision/alignment.
void draw_text_run(Gfx::FloatPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale, Gfx::Orientation); void draw_glyph_run(Gfx::FloatPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale, Gfx::Orientation);
void add_clip_rect(Gfx::IntRect const& rect); void add_clip_rect(Gfx::IntRect const& rect);

4
Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -871,14 +871,14 @@ void paint_text_fragment(PaintContext& context, TextPaintable const& paintable,
fragment_absolute_rect.x().to_float(), fragment_absolute_rect.x().to_float(),
fragment_absolute_rect.y().to_float() + fragment.baseline().to_float(), fragment_absolute_rect.y().to_float() + fragment.baseline().to_float(),
} * scale; } * scale;
painter.draw_text_run(baseline_start, *glyph_run, paintable.computed_values().webkit_text_fill_color(), fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation()); painter.draw_glyph_run(baseline_start, *glyph_run, paintable.computed_values().webkit_text_fill_color(), fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation());
auto selection_rect = context.enclosing_device_rect(fragment.selection_rect()).to_type<int>(); auto selection_rect = context.enclosing_device_rect(fragment.selection_rect()).to_type<int>();
if (!selection_rect.is_empty()) { if (!selection_rect.is_empty()) {
painter.fill_rect(selection_rect, CSS::SystemColor::highlight(paintable.computed_values().color_scheme())); painter.fill_rect(selection_rect, CSS::SystemColor::highlight(paintable.computed_values().color_scheme()));
DisplayListRecorderStateSaver saver(painter); DisplayListRecorderStateSaver saver(painter);
painter.add_clip_rect(selection_rect); painter.add_clip_rect(selection_rect);
painter.draw_text_run(baseline_start, *glyph_run, CSS::SystemColor::highlight_text(paintable.computed_values().color_scheme()), fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation()); painter.draw_glyph_run(baseline_start, *glyph_run, CSS::SystemColor::highlight_text(paintable.computed_values().color_scheme()), fragment_absolute_device_rect.to_type<int>(), scale, fragment.orientation());
} }
paint_text_decoration(context, paintable, fragment); paint_text_decoration(context, paintable, fragment);