beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-23 08:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibPDF: Pass Renderer to SimpleFont::draw_glyph()

Browse source 
This makes it available in Type3Font::draw_glyph().

No behavior change.
This commit is contained in:
Nico Weber 2023-11-14 10:18:36 -05:00 committed by Sam Atkins
parent bcc6439b5f
commit 126a0be595
Notes: sideshowbarker 2024-07-17 03:27:40 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/126a0be595
Pull-request: https://github.com/SerenityOS/serenity/pull/21946
Reviewed-by: https://github.com/AtkinsSJ
8 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibPDF/Fonts/SimpleFont.cpp
View file

@ -48,8 +48,6 @@ PDFErrorOr<void> SimpleFont::initialize(Document* document, NonnullRefPtr<DictOb
PDFErrorOr<Gfx::FloatPoint> SimpleFont::draw_string(Gfx::Painter& painter, Gfx::FloatPoint glyph_position, DeprecatedString const& string, Renderer const& renderer)
{
Color const& paint_color = renderer.state().paint_color;
auto const& text_rendering_matrix = renderer.calculate_text_rendering_matrix();
auto font_size = text_rendering_matrix.x_scale() * renderer.text_state().font_size;
@ -68,7 +66,7 @@ PDFErrorOr<Gfx::FloatPoint> SimpleFont::draw_string(Gfx::Painter& painter, Gfx::
else
glyph_width = m_missing_width; // FIXME: times m_font_matrix.x_scale() probably?
TRY(draw_glyph(painter, glyph_position, glyph_width, char_code, paint_color));
TRY(draw_glyph(painter, glyph_position, glyph_width, char_code, renderer));
auto tx = glyph_width;
tx += character_spacing;

2
Userland/Libraries/LibPDF/Fonts/SimpleFont.h
View file

@ -18,7 +18,7 @@ public:
protected:
PDFErrorOr<void> initialize(Document* document, NonnullRefPtr<DictObject> const& dict, float font_size) override;
virtual Optional<float> get_glyph_width(u8 char_code) const = 0;
virtual PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Color color) = 0;
virtual PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const&) = 0;
RefPtr<Encoding>& encoding() { return m_encoding; }
RefPtr<Encoding> const& encoding() const { return m_encoding; }

5
Userland/Libraries/LibPDF/Fonts/TrueTypeFont.cpp
View file

@ -10,6 +10,7 @@
#include <LibGfx/Painter.h>
#include <LibPDF/CommonNames.h>
#include <LibPDF/Fonts/TrueTypeFont.h>
#include <LibPDF/Renderer.h>
namespace PDF {
@ -47,8 +48,10 @@ void TrueTypeFont::set_font_size(float font_size)
m_font = m_font->with_size((font_size * POINTS_PER_INCH) / DEFAULT_DPI);
}
PDFErrorOr<void> TrueTypeFont::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float, u8 char_code, Color color)
PDFErrorOr<void> TrueTypeFont::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float, u8 char_code, Renderer const& renderer)
{
auto color = renderer.state().paint_color;
// Account for the reversed font baseline
auto position = point.translated(0, -m_font->baseline());
painter.draw_glyph(position, char_code, *m_font, color);

2
Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h
View file

@ -16,7 +16,7 @@ class TrueTypeFont : public SimpleFont {
public:
Optional<float> get_glyph_width(u8 char_code) const override;
void set_font_size(float font_size) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter&, Gfx::FloatPoint, float, u8, Color) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter&, Gfx::FloatPoint, float, u8, Renderer const&) override;
DeprecatedFlyString base_font_name() const { return m_base_font_name; }

5
Userland/Libraries/LibPDF/Fonts/Type1Font.cpp
View file

@ -10,6 +10,7 @@
#include <LibPDF/Fonts/CFF.h>
#include <LibPDF/Fonts/PS1FontProgram.h>
#include <LibPDF/Fonts/Type1Font.h>
#include <LibPDF/Renderer.h>
namespace PDF {
@ -64,8 +65,10 @@ void Type1Font::set_font_size(float font_size)
m_font = m_font->with_size((font_size * POINTS_PER_INCH) / DEFAULT_DPI);
}
PDFErrorOr<void> Type1Font::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Color color)
PDFErrorOr<void> Type1Font::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const& renderer)
{
auto color = renderer.state().paint_color;
if (!m_font_program) {
// Account for the reversed font baseline
auto position = point.translated(0, -m_font->baseline());

2
Userland/Libraries/LibPDF/Fonts/Type1Font.h
View file

@ -24,7 +24,7 @@ class Type1Font : public SimpleFont {
public:
Optional<float> get_glyph_width(u8 char_code) const override;
void set_font_size(float font_size) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Color color) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const&) override;
DeprecatedFlyString base_font_name() const { return m_base_font_name; }

2
Userland/Libraries/LibPDF/Fonts/Type3Font.cpp
View file

@ -53,7 +53,7 @@ void Type3Font::set_font_size(float)
{
}
PDFErrorOr<void> Type3Font::draw_glyph(Gfx::Painter&, Gfx::FloatPoint, float, u8 char_code, Color)
PDFErrorOr<void> Type3Font::draw_glyph(Gfx::Painter&, Gfx::FloatPoint, float, u8 char_code, Renderer const&)
{
// "For each character code shown by a text-showing operator that uses a Type 3 font,
// the consumer application does the following:""

2
Userland/Libraries/LibPDF/Fonts/Type3Font.h
View file

@ -14,7 +14,7 @@ class Type3Font : public SimpleFont {
public:
Optional<float> get_glyph_width(u8 char_code) const override;
void set_font_size(float font_size) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Color color) override;
PDFErrorOr<void> draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const&) override;
protected:
PDFErrorOr<void> initialize(Document*, NonnullRefPtr<DictObject> const&, float font_size) override;