eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-25 17:25:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Flatten Platform::FontPlugin by merging WebView::FontPlugin

Browse Source 
WebView::FontPlugin was the only implementation of the abstract
FontPlugin base class. Its dependencies (LibGfx, LibCore) are
already visible to LibWeb.

Remove the virtual dispatch by making FontPlugin concrete and
absorbing the WebView::FontPlugin implementation directly.
This commit is contained in:
Andreas Kling
2026-02-28 10:35:45 +01:00
committed by Shannon Booth
parent 3cfc7aa629
commit b20d14970f
Notes: github-actions[bot] 2026-02-28 14:33:15 +00:00 
Author: https://github.com/awesomekling
Commit: https://github.com/LadybirdBrowser/ladybird/commit/b20d14970f6
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8218
Reviewed-by: https://github.com/shannonbooth ✅
9 changed files with 226 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Libraries/LibWeb/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
include(fontconfig)
include(libweb_generators)
include(vulkan)
include(skia)
@@ -1215,6 +1216,10 @@ find_package(LibXml2 REQUIRED)
target_link_libraries(LibWeb PRIVATE LibCore LibCompress LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests LibGC LibThreading skia ${ANGLE_TARGETS} SDL3::SDL3 LibXml2::LibXml2)
if (HAS_FONTCONFIG)
target_link_libraries(LibWeb PRIVATE Fontconfig::Fontconfig)
endif()
# FIXME: https://github.com/microsoft/vcpkg/issues/42324
target_include_directories(LibWeb PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)

196
Libraries/LibWeb/Platform/FontPlugin.cpp
View File

@@ -1,11 +1,24 @@
/*
* Copyright (c) 2022, Andreas Kling <andreas@ladybird.org>
* Copyright (c) 2022-2023, Andreas Kling <andreas@ladybird.org>
* Copyright (c) 2023, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/ByteString.h>
#include <AK/String.h>
#include <AK/TypeCasts.h>
#include <LibCore/Resource.h>
#include <LibCore/StandardPaths.h>
#include <LibGfx/Font/Font.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/Font/PathFontProvider.h>
#include <LibWeb/Platform/FontPlugin.h>
#ifdef USE_FONTCONFIG
# include <LibGfx/Font/GlobalFontConfig.h>
#endif
namespace Web::Platform {
static FontPlugin* s_the;
@@ -22,6 +35,187 @@ void FontPlugin::install(FontPlugin& plugin)
s_the = &plugin;
}
FontPlugin::FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* font_provider)
: m_is_layout_test_mode(is_layout_test_mode)
{
if (!font_provider)
font_provider = &static_cast<Gfx::PathFontProvider&>(Gfx::FontDatabase::the().install_system_font_provider(make<Gfx::PathFontProvider>()));
if (is<Gfx::PathFontProvider>(*font_provider)) {
auto& path_font_provider = static_cast<Gfx::PathFontProvider&>(*font_provider);
// Load anything we can find in the system's font directories
for (auto const& path : Gfx::FontDatabase::font_directories().release_value_but_fixme_should_propagate_errors())
path_font_provider.load_all_fonts_from_uri(MUST(String::formatted("file://{}", path)));
}
update_generic_fonts();
m_default_font_name = generic_font_name(GenericFont::UiSansSerif);
auto default_fixed_width_font_name = generic_font_name(GenericFont::UiMonospace);
m_default_fixed_width_font = Gfx::FontDatabase::the().get(default_fixed_width_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
VERIFY(m_default_fixed_width_font);
if (is_layout_test_mode) {
m_symbol_font_names = { "Noto Emoji"_fly_string };
} else {
#ifdef AK_OS_MACOS
m_symbol_font_names = { "Apple Color Emoji"_fly_string, "Apple Symbols"_fly_string };
#else
m_symbol_font_names = { "Noto Color Emoji"_fly_string, "Noto Sans Symbols"_fly_string };
#endif
}
}
FontPlugin::~FontPlugin() = default;
RefPtr<Gfx::Font> FontPlugin::default_font(float point_size, Optional<Gfx::FontVariationSettings> const& font_variation_settings, Optional<Gfx::ShapeFeatures> const& shape_features)
{
return Gfx::FontDatabase::the().get(m_default_font_name, point_size, 400, Gfx::FontWidth::Normal, 0, font_variation_settings, shape_features);
}
Gfx::Font& FontPlugin::default_fixed_width_font()
{
return *m_default_fixed_width_font;
}
Vector<FlyString> FontPlugin::symbol_font_names()
{
return m_symbol_font_names;
}
#ifdef USE_FONTCONFIG
static Optional<String> query_fontconfig_for_generic_family(GenericFont generic_font)
{
char const* pattern_string = nullptr;
switch (generic_font) {
case GenericFont::Cursive:
pattern_string = "cursive";
break;
case GenericFont::Fantasy:
pattern_string = "fantasy";
break;
case GenericFont::Monospace:
pattern_string = "monospace";
break;
case GenericFont::SansSerif:
pattern_string = "sans-serif";
break;
case GenericFont::Serif:
pattern_string = "serif";
break;
case GenericFont::UiMonospace:
pattern_string = "monospace";
break;
case GenericFont::UiRounded:
pattern_string = "sans-serif";
break;
case GenericFont::UiSansSerif:
pattern_string = "sans-serif";
break;
case GenericFont::UiSerif:
pattern_string = "serif";
break;
default:
VERIFY_NOT_REACHED();
}
auto* config = Gfx::GlobalFontConfig::the().get();
VERIFY(config);
FcPattern* pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(pattern_string));
VERIFY(pattern);
auto success = FcConfigSubstitute(config, pattern, FcMatchPattern);
VERIFY(success);
FcDefaultSubstitute(pattern);
// Never select bitmap fonts.
success = FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
VERIFY(success);
// FIXME: Enable this once we can handle OpenType variable fonts.
success = FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
VERIFY(success);
Optional<String> name;
FcResult result {};
if (auto* matched = FcFontMatch(config, pattern, &result)) {
FcChar8* family = nullptr;
if (FcPatternGetString(matched, FC_FAMILY, 0, &family) == FcResultMatch) {
auto const* family_cstring = reinterpret_cast<char const*>(family);
if (auto string = String::from_utf8(StringView { family_cstring, strlen(family_cstring) }); !string.is_error()) {
name = string.release_value();
}
}
FcPatternDestroy(matched);
}
FcPatternDestroy(pattern);
return name;
}
#endif
void FontPlugin::update_generic_fonts()
{
// How we choose which system font to use for each CSS font:
// 1. Try a list of known-suitable fonts with their names hard-coded below.
// This is rather weird, but it's how things work right now.
// We should eventually have a way to query the system for the default font.
// Furthermore, we should allow overriding via some kind of configuration mechanism.
m_generic_font_names.resize(static_cast<size_t>(GenericFont::__Count));
auto update_mapping = [&](GenericFont generic_font, ReadonlySpan<FlyString> fallbacks) {
if (m_is_layout_test_mode) {
m_generic_font_names[static_cast<size_t>(generic_font)] = "SerenitySans"_fly_string;
return;
}
RefPtr<Gfx::Font const> gfx_font;
#ifdef USE_FONTCONFIG
auto name = query_fontconfig_for_generic_family(generic_font);
if (name.has_value()) {
gfx_font = Gfx::FontDatabase::the().get(name.value(), 16, 400, Gfx::FontWidth::Normal, 0);
}
#endif
if (!gfx_font) {
for (auto const& fallback : fallbacks) {
gfx_font = Gfx::FontDatabase::the().get(fallback, 16, 400, Gfx::FontWidth::Normal, 0);
if (gfx_font)
break;
}
}
m_generic_font_names[static_cast<size_t>(generic_font)] = gfx_font ? gfx_font->family() : String {};
};
// Fallback fonts to look for if Gfx::Font can't load expected font
// The lists are basically arbitrary, taken from https://www.w3.org/Style/Examples/007/fonts.en.html
// (We also add Android-specific font names to the list from W3 where required.)
Vector<FlyString> cursive_fallbacks { "Comic Sans MS"_fly_string, "Comic Sans"_fly_string, "Apple Chancery"_fly_string, "Bradley Hand"_fly_string, "Brush Script MT"_fly_string, "Snell Roundhand"_fly_string, "URW Chancery L"_fly_string, "Dancing Script"_fly_string };
Vector<FlyString> fantasy_fallbacks { "Impact"_fly_string, "Luminari"_fly_string, "Chalkduster"_fly_string, "Jazz LET"_fly_string, "Blippo"_fly_string, "Stencil Std"_fly_string, "Marker Felt"_fly_string, "Trattatello"_fly_string, "Coming Soon"_fly_string };
Vector<FlyString> monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "Noto Sans Mono"_fly_string, "DejaVu Sans Mono"_fly_string, "Droid Sans Mono"_fly_string, "Liberation Mono"_fly_string };
Vector<FlyString> sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string, "Roboto"_fly_string };
Vector<FlyString> serif_fallbacks { "Times"_fly_string, "Times New Roman"_fly_string, "Didot"_fly_string, "Georgia"_fly_string, "Palatino"_fly_string, "Bookman"_fly_string, "New Century Schoolbook"_fly_string, "American Typewriter"_fly_string, "Liberation Serif"_fly_string, "Roman"_fly_string, "Noto Serif"_fly_string };
update_mapping(GenericFont::Cursive, cursive_fallbacks);
update_mapping(GenericFont::Fantasy, fantasy_fallbacks);
update_mapping(GenericFont::Monospace, monospace_fallbacks);
update_mapping(GenericFont::SansSerif, sans_serif_fallbacks);
update_mapping(GenericFont::Serif, serif_fallbacks);
update_mapping(GenericFont::UiMonospace, monospace_fallbacks);
update_mapping(GenericFont::UiRounded, sans_serif_fallbacks);
update_mapping(GenericFont::UiSansSerif, sans_serif_fallbacks);
update_mapping(GenericFont::UiSerif, serif_fallbacks);
}
FlyString FontPlugin::generic_font_name(GenericFont generic_font)
{
return m_generic_font_names[static_cast<size_t>(generic_font)];
}
}

28
Libraries/LibWeb/Platform/FontPlugin.h
View File

@@ -6,9 +6,11 @@
#pragma once
#include <AK/Forward.h>
#include <AK/FlyString.h>
#include <AK/RefPtr.h>
#include <AK/Vector.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/Font/FontVariationSettings.h>
#include <LibGfx/Forward.h>
#include <LibGfx/ShapeFeature.h>
#include <LibWeb/Export.h>
@@ -29,18 +31,28 @@ enum class GenericFont {
class WEB_API FontPlugin {
public:
FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* = nullptr);
~FontPlugin();
static FontPlugin& the();
static void install(FontPlugin&);
virtual ~FontPlugin();
RefPtr<Gfx::Font> default_font(float point_size, Optional<Gfx::FontVariationSettings> const& font_variation_settings = {}, Optional<Gfx::ShapeFeatures> const& shape_features = {});
Gfx::Font& default_fixed_width_font();
virtual RefPtr<Gfx::Font> default_font(float point_size, Optional<Gfx::FontVariationSettings> const& font_variation_settings = {}, Optional<Gfx::ShapeFeatures> const& shape_features = {}) = 0;
virtual Gfx::Font& default_fixed_width_font() = 0;
FlyString generic_font_name(GenericFont);
Vector<FlyString> symbol_font_names();
virtual FlyString generic_font_name(GenericFont) = 0;
virtual Vector<FlyString> symbol_font_names() = 0;
bool is_layout_test_mode() const { return m_is_layout_test_mode; }
virtual bool is_layout_test_mode() const = 0;
void update_generic_fonts();
private:
Vector<FlyString> m_generic_font_names;
Vector<FlyString> m_symbol_font_names;
FlyString m_default_font_name;
RefPtr<Gfx::Font> m_default_fixed_width_font;
bool m_is_layout_test_mode { false };
};
}

1
Libraries/LibWebView/CMakeLists.txt
View File

@@ -13,7 +13,6 @@ set(SOURCES
HelperProcess.cpp
Menu.cpp
Mutation.cpp
Plugins/FontPlugin.cpp
Plugins/ImageCodecPlugin.cpp
Process.cpp
ProcessHandle.cpp

207
Libraries/LibWebView/Plugins/FontPlugin.cpp
View File

@@ -1,207 +0,0 @@
/*
* Copyright (c) 2022-2023, Andreas Kling <andreas@ladybird.org>
* Copyright (c) 2023, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/ByteString.h>
#include <AK/String.h>
#include <AK/TypeCasts.h>
#include <LibCore/Resource.h>
#include <LibCore/StandardPaths.h>
#include <LibGfx/Font/Font.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/Font/PathFontProvider.h>
#include <LibWebView/Plugins/FontPlugin.h>
#ifdef USE_FONTCONFIG
# include <LibGfx/Font/GlobalFontConfig.h>
#endif
namespace WebView {
FontPlugin::FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* font_provider)
: m_is_layout_test_mode(is_layout_test_mode)
{
if (!font_provider)
font_provider = &static_cast<Gfx::PathFontProvider&>(Gfx::FontDatabase::the().install_system_font_provider(make<Gfx::PathFontProvider>()));
if (is<Gfx::PathFontProvider>(*font_provider)) {
auto& path_font_provider = static_cast<Gfx::PathFontProvider&>(*font_provider);
// Load anything we can find in the system's font directories
for (auto const& path : Gfx::FontDatabase::font_directories().release_value_but_fixme_should_propagate_errors())
path_font_provider.load_all_fonts_from_uri(MUST(String::formatted("file://{}", path)));
}
update_generic_fonts();
m_default_font_name = generic_font_name(Web::Platform::GenericFont::UiSansSerif);
auto default_fixed_width_font_name = generic_font_name(Web::Platform::GenericFont::UiMonospace);
m_default_fixed_width_font = Gfx::FontDatabase::the().get(default_fixed_width_font_name, 12.0, 400, Gfx::FontWidth::Normal, 0);
VERIFY(m_default_fixed_width_font);
if (is_layout_test_mode) {
m_symbol_font_names = { "Noto Emoji"_fly_string };
} else {
#ifdef AK_OS_MACOS
m_symbol_font_names = { "Apple Color Emoji"_fly_string, "Apple Symbols"_fly_string };
#else
m_symbol_font_names = { "Noto Color Emoji"_fly_string, "Noto Sans Symbols"_fly_string };
#endif
}
}
FontPlugin::~FontPlugin() = default;
RefPtr<Gfx::Font> FontPlugin::default_font(float point_size, Optional<Gfx::FontVariationSettings> const& font_variation_settings, Optional<Gfx::ShapeFeatures> const& shape_features)
{
return Gfx::FontDatabase::the().get(m_default_font_name, point_size, 400, Gfx::FontWidth::Normal, 0, font_variation_settings, shape_features);
}
Gfx::Font& FontPlugin::default_fixed_width_font()
{
return *m_default_fixed_width_font;
}
Vector<FlyString> FontPlugin::symbol_font_names()
{
return m_symbol_font_names;
}
#ifdef USE_FONTCONFIG
static Optional<String> query_fontconfig_for_generic_family(Web::Platform::GenericFont generic_font)
{
char const* pattern_string = nullptr;
switch (generic_font) {
case Web::Platform::GenericFont::Cursive:
pattern_string = "cursive";
break;
case Web::Platform::GenericFont::Fantasy:
pattern_string = "fantasy";
break;
case Web::Platform::GenericFont::Monospace:
pattern_string = "monospace";
break;
case Web::Platform::GenericFont::SansSerif:
pattern_string = "sans-serif";
break;
case Web::Platform::GenericFont::Serif:
pattern_string = "serif";
break;
case Web::Platform::GenericFont::UiMonospace:
pattern_string = "monospace";
break;
case Web::Platform::GenericFont::UiRounded:
pattern_string = "sans-serif";
break;
case Web::Platform::GenericFont::UiSansSerif:
pattern_string = "sans-serif";
break;
case Web::Platform::GenericFont::UiSerif:
pattern_string = "serif";
break;
default:
VERIFY_NOT_REACHED();
}
auto* config = Gfx::GlobalFontConfig::the().get();
VERIFY(config);
FcPattern* pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(pattern_string));
VERIFY(pattern);
auto success = FcConfigSubstitute(config, pattern, FcMatchPattern);
VERIFY(success);
FcDefaultSubstitute(pattern);
// Never select bitmap fonts.
success = FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
VERIFY(success);
// FIXME: Enable this once we can handle OpenType variable fonts.
success = FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
VERIFY(success);
Optional<String> name;
FcResult result {};
if (auto* matched = FcFontMatch(config, pattern, &result)) {
FcChar8* family = nullptr;
if (FcPatternGetString(matched, FC_FAMILY, 0, &family) == FcResultMatch) {
auto const* family_cstring = reinterpret_cast<char const*>(family);
if (auto string = String::from_utf8(StringView { family_cstring, strlen(family_cstring) }); !string.is_error()) {
name = string.release_value();
}
}
FcPatternDestroy(matched);
}
FcPatternDestroy(pattern);
return name;
}
#endif
void FontPlugin::update_generic_fonts()
{
// How we choose which system font to use for each CSS font:
// 1. Try a list of known-suitable fonts with their names hard-coded below.
// This is rather weird, but it's how things work right now.
// We should eventually have a way to query the system for the default font.
// Furthermore, we should allow overriding via some kind of configuration mechanism.
m_generic_font_names.resize(static_cast<size_t>(Web::Platform::GenericFont::__Count));
auto update_mapping = [&](Web::Platform::GenericFont generic_font, ReadonlySpan<FlyString> fallbacks) {
if (m_is_layout_test_mode) {
m_generic_font_names[static_cast<size_t>(generic_font)] = "SerenitySans"_fly_string;
return;
}
RefPtr<Gfx::Font const> gfx_font;
#ifdef USE_FONTCONFIG
auto name = query_fontconfig_for_generic_family(generic_font);
if (name.has_value()) {
gfx_font = Gfx::FontDatabase::the().get(name.value(), 16, 400, Gfx::FontWidth::Normal, 0);
}
#endif
if (!gfx_font) {
for (auto const& fallback : fallbacks) {
gfx_font = Gfx::FontDatabase::the().get(fallback, 16, 400, Gfx::FontWidth::Normal, 0);
if (gfx_font)
break;
}
}
m_generic_font_names[static_cast<size_t>(generic_font)] = gfx_font ? gfx_font->family() : String {};
};
// Fallback fonts to look for if Gfx::Font can't load expected font
// The lists are basically arbitrary, taken from https://www.w3.org/Style/Examples/007/fonts.en.html
// (We also add Android-specific font names to the list from W3 where required.)
Vector<FlyString> cursive_fallbacks { "Comic Sans MS"_fly_string, "Comic Sans"_fly_string, "Apple Chancery"_fly_string, "Bradley Hand"_fly_string, "Brush Script MT"_fly_string, "Snell Roundhand"_fly_string, "URW Chancery L"_fly_string, "Dancing Script"_fly_string };
Vector<FlyString> fantasy_fallbacks { "Impact"_fly_string, "Luminari"_fly_string, "Chalkduster"_fly_string, "Jazz LET"_fly_string, "Blippo"_fly_string, "Stencil Std"_fly_string, "Marker Felt"_fly_string, "Trattatello"_fly_string, "Coming Soon"_fly_string };
Vector<FlyString> monospace_fallbacks { "Andale Mono"_fly_string, "Courier New"_fly_string, "Courier"_fly_string, "FreeMono"_fly_string, "OCR A Std"_fly_string, "Noto Sans Mono"_fly_string, "DejaVu Sans Mono"_fly_string, "Droid Sans Mono"_fly_string, "Liberation Mono"_fly_string };
Vector<FlyString> sans_serif_fallbacks { "Arial"_fly_string, "Helvetica"_fly_string, "Verdana"_fly_string, "Trebuchet MS"_fly_string, "Gill Sans"_fly_string, "Noto Sans"_fly_string, "Avantgarde"_fly_string, "Optima"_fly_string, "Arial Narrow"_fly_string, "Liberation Sans"_fly_string, "Roboto"_fly_string };
Vector<FlyString> serif_fallbacks { "Times"_fly_string, "Times New Roman"_fly_string, "Didot"_fly_string, "Georgia"_fly_string, "Palatino"_fly_string, "Bookman"_fly_string, "New Century Schoolbook"_fly_string, "American Typewriter"_fly_string, "Liberation Serif"_fly_string, "Roman"_fly_string, "Noto Serif"_fly_string };
update_mapping(Web::Platform::GenericFont::Cursive, cursive_fallbacks);
update_mapping(Web::Platform::GenericFont::Fantasy, fantasy_fallbacks);
update_mapping(Web::Platform::GenericFont::Monospace, monospace_fallbacks);
update_mapping(Web::Platform::GenericFont::SansSerif, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::Serif, serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiMonospace, monospace_fallbacks);
update_mapping(Web::Platform::GenericFont::UiRounded, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiSansSerif, sans_serif_fallbacks);
update_mapping(Web::Platform::GenericFont::UiSerif, serif_fallbacks);
}
FlyString FontPlugin::generic_font_name(Web::Platform::GenericFont generic_font)
{
return m_generic_font_names[static_cast<size_t>(generic_font)];
}
}

38
Libraries/LibWebView/Plugins/FontPlugin.h
View File

@@ -1,38 +0,0 @@
/*
* Copyright (c) 2022, Andreas Kling <andreas@ladybird.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/RefPtr.h>
#include <AK/Vector.h>
#include <LibGfx/Font/FontDatabase.h>
#include <LibWeb/Platform/FontPlugin.h>
#include <LibWebView/Forward.h>
namespace WebView {
class WEBVIEW_API FontPlugin final : public Web::Platform::FontPlugin {
public:
FontPlugin(bool is_layout_test_mode, Gfx::SystemFontProvider* = nullptr);
virtual ~FontPlugin();
virtual RefPtr<Gfx::Font> default_font(float point_size, Optional<Gfx::FontVariationSettings> const& font_variation_settings = {}, Optional<Gfx::ShapeFeatures> const& shape_features = {}) override;
virtual Gfx::Font& default_fixed_width_font() override;
virtual FlyString generic_font_name(Web::Platform::GenericFont) override;
virtual Vector<FlyString> symbol_font_names() override;
virtual bool is_layout_test_mode() const override { return m_is_layout_test_mode; }
void update_generic_fonts();
private:
Vector<FlyString> m_generic_font_names;
Vector<FlyString> m_symbol_font_names;
FlyString m_default_font_name;
RefPtr<Gfx::Font> m_default_fixed_width_font;
bool m_is_layout_test_mode { false };
};
}

4
Services/WebContent/main.cpp
View File

@@ -31,8 +31,8 @@
#include <LibWeb/Painting/BackingStoreManager.h>
#include <LibWeb/Painting/PaintableBox.h>
#include <LibWeb/Platform/EventLoopPlugin.h>
#include <LibWeb/Platform/FontPlugin.h>
#include <LibWeb/WebIDL/Tracing.h>
#include <LibWebView/Plugins/FontPlugin.h>
#include <LibWebView/Plugins/ImageCodecPlugin.h>
#include <LibWebView/SiteIsolation.h>
#include <LibWebView/Utilities.h>
@@ -195,7 +195,7 @@ ErrorOr<int> ladybird_main(Main::Arguments arguments)
Web::HTML::Window::set_internals_object_exposed(expose_internals_object);
Web::HTML::UniversalGlobalScopeMixin::set_experimental_interfaces_exposed(expose_experimental_interfaces);
Web::Platform::FontPlugin::install(*new WebView::FontPlugin(enable_test_mode, &font_provider));
Web::Platform::FontPlugin::install(*new Web::Platform::FontPlugin(enable_test_mode, &font_provider));
Web::Bindings::initialize_main_thread_vm(Web::Bindings::AgentType::SimilarOriginWindow);

4
Services/WebWorker/main.cpp
View File

@@ -18,8 +18,8 @@
#include <LibWeb/Loader/GeneratedPagesLoader.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Platform/EventLoopPlugin.h>
#include <LibWeb/Platform/FontPlugin.h>
#include <LibWebView/HelperProcess.h>
#include <LibWebView/Plugins/FontPlugin.h>
#include <LibWebView/Plugins/ImageCodecPlugin.h>
#include <LibWebView/Utilities.h>
#include <WebWorker/ConnectionFromClient.h>
@@ -91,7 +91,7 @@ ErrorOr<int> ladybird_main(Main::Arguments arguments)
Web::Platform::EventLoopPlugin::install(*new Web::Platform::EventLoopPlugin);
Web::Platform::FontPlugin::install(*new WebView::FontPlugin(false));
Web::Platform::FontPlugin::install(*new Web::Platform::FontPlugin(false));
Web::Bindings::initialize_main_thread_vm(worker_type);

4
UI/Android/src/main/cpp/WebContentService.cpp
View File

@@ -23,8 +23,8 @@
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/PermissionsPolicy/AutoplayAllowlist.h>
#include <LibWeb/Platform/EventLoopPlugin.h>
#include <LibWeb/Platform/FontPlugin.h>
#include <LibWebView/HelperProcess.h>
#include <LibWebView/Plugins/FontPlugin.h>
#include <LibWebView/Plugins/ImageCodecPlugin.h>
#include <LibWebView/SiteIsolation.h>
#include <LibWebView/Utilities.h>
@@ -62,7 +62,7 @@ ErrorOr<int> service_main(int ipc_socket)
bool is_test_mode = false;
Web::HTML::Window::set_internals_object_exposed(is_test_mode);
Web::Platform::FontPlugin::install(*new WebView::FontPlugin(is_test_mode));
Web::Platform::FontPlugin::install(*new Web::Platform::FontPlugin(is_test_mode));
// Currently site isolation doesn't work on Android since everything is running
// in the same process. It would require an entire redesign of this port