fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-06 08:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx+WebContent: Load resource://fonts after FontDatabase construction

Browse Source 
This is a preparation for upcoming changes where Gfx::Typeface will
depend on `FontDatabase::should_force_fontconfig()`, so we will no
longer be able to construct typefaces from FontDatabase constructor
because of circular dependency.
This commit is contained in:
Aliaksandr Kalenik
2024-09-04 17:26:16 +02:00
committed by Alexander Kalenik
parent db74244fb2
commit 99f64139d0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ladybird/WebContent/main.cpp
View File

@@ -136,6 +136,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Gfx::FontDatabase::the().set_force_fontconfig(true); Gfx::FontDatabase::the().set_force_fontconfig(true);
} }
Gfx::FontDatabase::the().load_all_fonts_from_uri("resource://fonts"sv);
// Layout test mode implies internals object is exposed and the Skia CPU backend is used // Layout test mode implies internals object is exposed and the Skia CPU backend is used
if (is_layout_test_mode) { if (is_layout_test_mode) {
expose_internals_object = true; expose_internals_object = true;

1
Userland/Libraries/LibGfx/Font/FontDatabase.cpp
View File

@@ -78,7 +78,6 @@ void FontDatabase::load_all_fonts_from_uri(StringView uri)
FontDatabase::FontDatabase() FontDatabase::FontDatabase()
: m_private(make<Private>()) : m_private(make<Private>())
{ {
load_all_fonts_from_uri("resource://fonts"sv);
} }
RefPtr<Gfx::Font> FontDatabase::get(FlyString const& family, float point_size, unsigned weight, unsigned width, unsigned slope) RefPtr<Gfx::Font> FontDatabase::get(FlyString const& family, float point_size, unsigned weight, unsigned width, unsigned slope)