fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx: Use FlyString for family name

Browse Source 
This value gets converted to FlyString a lot, so let's just make it
a FlyString in the first place!
This commit is contained in:
Jonne Ransijn
2024-10-26 15:45:34 +02:00
committed by Andreas Kling
parent 7865fbfe6d
commit 6e86ad65e9
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Userland/Libraries/LibGfx/Font/Font.h
View File

@@ -85,7 +85,7 @@ public:
virtual float width(StringView) const = 0; virtual float width(StringView) const = 0;
virtual float width(Utf8View const&) const = 0; virtual float width(Utf8View const&) const = 0;
virtual String family() const = 0; virtual FlyString family() const = 0;
virtual NonnullRefPtr<Font> with_size(float point_size) const = 0; virtual NonnullRefPtr<Font> with_size(float point_size) const = 0;

3
Userland/Libraries/LibGfx/Font/ScaledFont.h
View File

@@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/FlyString.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Font/Font.h> #include <LibGfx/Font/Font.h>
@@ -36,7 +37,7 @@ public:
virtual u8 baseline() const override { return m_point_height; } // FIXME: Read from font virtual u8 baseline() const override { return m_point_height; } // FIXME: Read from font
virtual float width(StringView) const override; virtual float width(StringView) const override;
virtual float width(Utf8View const&) const override; virtual float width(Utf8View const&) const override;
virtual String family() const override { return m_typeface->family(); } virtual FlyString family() const override { return m_typeface->family(); }
virtual NonnullRefPtr<ScaledFont> scaled_with_size(float point_size) const; virtual NonnullRefPtr<ScaledFont> scaled_with_size(float point_size) const;
virtual NonnullRefPtr<Font> with_size(float point_size) const override; virtual NonnullRefPtr<Font> with_size(float point_size) const override;

2
Userland/Libraries/LibGfx/Font/Typeface.h
View File

@@ -47,7 +47,7 @@ public:
virtual u32 glyph_count() const = 0; virtual u32 glyph_count() const = 0;
virtual u16 units_per_em() const = 0; virtual u16 units_per_em() const = 0;
virtual u32 glyph_id_for_code_point(u32 code_point) const = 0; virtual u32 glyph_id_for_code_point(u32 code_point) const = 0;
virtual String family() const = 0; virtual FlyString family() const = 0;
virtual u16 weight() const = 0; virtual u16 weight() const = 0;
virtual u16 width() const = 0; virtual u16 width() const = 0;
virtual u8 slope() const = 0; virtual u8 slope() const = 0;

4
Userland/Libraries/LibGfx/Font/TypefaceSkia.cpp
View File

@@ -114,12 +114,12 @@ void TypefaceSkia::populate_glyph_page(GlyphPage& glyph_page, size_t page_index)
} }
} }
String TypefaceSkia::family() const FlyString TypefaceSkia::family() const
{ {
if (!m_family.has_value()) { if (!m_family.has_value()) {
SkString family_name; SkString family_name;
impl().skia_typeface->getFamilyName(&family_name); impl().skia_typeface->getFamilyName(&family_name);
m_family = String::from_utf8_without_validation(ReadonlyBytes { family_name.c_str(), family_name.size() }); m_family = FlyString::from_utf8_without_validation(ReadonlyBytes { family_name.c_str(), family_name.size() });
} }
return m_family.value(); return m_family.value();
} }

4
Userland/Libraries/LibGfx/Font/TypefaceSkia.h
View File

@@ -19,7 +19,7 @@ public:
virtual u32 glyph_count() const override; virtual u32 glyph_count() const override;
virtual u16 units_per_em() const override; virtual u16 units_per_em() const override;
virtual u32 glyph_id_for_code_point(u32 code_point) const override; virtual u32 glyph_id_for_code_point(u32 code_point) const override;
virtual String family() const override; virtual FlyString family() const override;
virtual u16 weight() const override; virtual u16 weight() const override;
virtual u16 width() const override; virtual u16 width() const override;
virtual u8 slope() const override; virtual u8 slope() const override;
@@ -39,7 +39,7 @@ private:
ReadonlyBytes m_buffer; ReadonlyBytes m_buffer;
unsigned m_ttc_index { 0 }; unsigned m_ttc_index { 0 };
mutable Optional<String> m_family; mutable Optional<FlyString> m_family;
// This cache stores information per code point. // This cache stores information per code point.
// It's segmented into pages with data about 256 code points each. // It's segmented into pages with data about 256 code points each.