From b6d60980bbb895fbf31f68fee4ad1246f2e16cd2 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 31 Jul 2023 17:52:36 -0600 Subject: [PATCH] Ladybird: Rename FontPluginQt -> Ladybird as it is unrelated to Qt now The Qt relationship was removed in de31a8a4, so let's acknowledge that and make it clearer to potential non-Qt ports that this file is usable by them :^). --- .../{FontPluginQt.cpp => FontPluginLadybird.cpp} | 16 ++++++++-------- .../{FontPluginQt.h => FontPluginLadybird.h} | 6 +++--- Ladybird/WebContent/CMakeLists.txt | 2 +- Ladybird/WebContent/main.cpp | 4 ++-- Meta/gn/secondary/Ladybird/WebContent/BUILD.gn | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) rename Ladybird/{FontPluginQt.cpp => FontPluginLadybird.cpp} (91%) rename Ladybird/{FontPluginQt.h => FontPluginLadybird.h} (81%) diff --git a/Ladybird/FontPluginQt.cpp b/Ladybird/FontPluginLadybird.cpp similarity index 91% rename from Ladybird/FontPluginQt.cpp rename to Ladybird/FontPluginLadybird.cpp index 03854116ce..3114b50d11 100644 --- a/Ladybird/FontPluginQt.cpp +++ b/Ladybird/FontPluginLadybird.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "FontPluginQt.h" +#include "FontPluginLadybird.h" #include #include #include @@ -16,7 +16,7 @@ extern DeprecatedString s_serenity_resource_root; namespace Ladybird { -FontPluginQt::FontPluginQt(bool is_layout_test_mode) +FontPluginLadybird::FontPluginLadybird(bool is_layout_test_mode) : m_is_layout_test_mode(is_layout_test_mode) { // Load the default SerenityOS fonts... @@ -42,19 +42,19 @@ FontPluginQt::FontPluginQt(bool is_layout_test_mode) VERIFY(m_default_fixed_width_font); } -FontPluginQt::~FontPluginQt() = default; +FontPluginLadybird::~FontPluginLadybird() = default; -Gfx::Font& FontPluginQt::default_font() +Gfx::Font& FontPluginLadybird::default_font() { return *m_default_font; } -Gfx::Font& FontPluginQt::default_fixed_width_font() +Gfx::Font& FontPluginLadybird::default_fixed_width_font() { return *m_default_fixed_width_font; } -void FontPluginQt::update_generic_fonts() +void FontPluginLadybird::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. @@ -90,7 +90,7 @@ void FontPluginQt::update_generic_fonts() m_generic_font_names[static_cast(generic_font)] = gfx_font->family(); }; - // Fallback fonts to look for if Gfx::Font can't load the font suggested by Qt. + // 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 Vector cursive_fallbacks { "Comic Sans MS", "Comic Sans", "Apple Chancery", "Bradley Hand", "Brush Script MT", "Snell Roundhand", "URW Chancery L" }; Vector fantasy_fallbacks { "Impact", "Luminari", "Chalkduster", "Jazz LET", "Blippo", "Stencil Std", "Marker Felt", "Trattatello" }; @@ -109,7 +109,7 @@ void FontPluginQt::update_generic_fonts() update_mapping(Web::Platform::GenericFont::UiSerif, serif_fallbacks); } -DeprecatedString FontPluginQt::generic_font_name(Web::Platform::GenericFont generic_font) +DeprecatedString FontPluginLadybird::generic_font_name(Web::Platform::GenericFont generic_font) { return m_generic_font_names[static_cast(generic_font)]; } diff --git a/Ladybird/FontPluginQt.h b/Ladybird/FontPluginLadybird.h similarity index 81% rename from Ladybird/FontPluginQt.h rename to Ladybird/FontPluginLadybird.h index 984628855f..1f28f7f47a 100644 --- a/Ladybird/FontPluginQt.h +++ b/Ladybird/FontPluginLadybird.h @@ -12,10 +12,10 @@ namespace Ladybird { -class FontPluginQt final : public Web::Platform::FontPlugin { +class FontPluginLadybird final : public Web::Platform::FontPlugin { public: - FontPluginQt(bool is_layout_test_mode); - virtual ~FontPluginQt(); + FontPluginLadybird(bool is_layout_test_mode); + virtual ~FontPluginLadybird(); virtual Gfx::Font& default_font() override; virtual Gfx::Font& default_fixed_width_font() override; diff --git a/Ladybird/WebContent/CMakeLists.txt b/Ladybird/WebContent/CMakeLists.txt index a4e499bce4..05383b8072 100644 --- a/Ladybird/WebContent/CMakeLists.txt +++ b/Ladybird/WebContent/CMakeLists.txt @@ -9,7 +9,7 @@ set(WEBCONTENT_SOURCES ../AudioCodecPluginLadybird.cpp ../AudioThread.cpp ../EventLoopImplementationQt.cpp - ../FontPluginQt.cpp + ../FontPluginLadybird.cpp ../ImageCodecPluginLadybird.cpp ../RequestManagerQt.cpp ../Utilities.cpp diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index f52cd754d5..7c48544e64 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -6,7 +6,7 @@ #include "../AudioCodecPluginLadybird.h" #include "../EventLoopImplementationQt.h" -#include "../FontPluginQt.h" +#include "../FontPluginLadybird.h" #include "../ImageCodecPluginLadybird.h" #include "../RequestManagerQt.h" #include "../Utilities.h" @@ -74,7 +74,7 @@ ErrorOr serenity_main(Main::Arguments arguments) VERIFY(webcontent_fd_passing_socket >= 0); - Web::Platform::FontPlugin::install(*new Ladybird::FontPluginQt(is_layout_test_mode)); + Web::Platform::FontPlugin::install(*new Ladybird::FontPluginLadybird(is_layout_test_mode)); Web::FrameLoader::set_error_page_url(DeprecatedString::formatted("file://{}/res/html/error.html", s_serenity_resource_root)); diff --git a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn index 74beb7ce12..987b5dd312 100644 --- a/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn +++ b/Meta/gn/secondary/Ladybird/WebContent/BUILD.gn @@ -47,7 +47,7 @@ executable("WebContent") { "../AudioCodecPluginLadybird.cpp", "../AudioThread.cpp", "../EventLoopImplementationQt.cpp", - "../FontPluginQt.cpp", + "../FontPluginLadybird.cpp", "../ImageCodecPluginLadybird.cpp", "../RequestManagerQt.cpp", "../Utilities.cpp",