From c09b5b8df0c767ec4df7a5a80bd8a0f39b6162af Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Fri, 12 Jul 2024 16:52:04 +0300 Subject: [PATCH] LibGfx+LibWeb: Rename Gfx::WOFF2::Font to Gfx::WOFF2::Typeface It's a leftover from VectorFont -> Typeface renaming --- Meta/Lagom/Fuzzers/FuzzWOFF2.cpp | 4 ++-- Tests/LibGfx/TestWOFF2.cpp | 6 +++--- Userland/Libraries/LibGfx/CMakeLists.txt | 2 +- .../LibGfx/Font/WOFF2/{Font.cpp => Typeface.cpp} | 6 +++--- .../Libraries/LibGfx/Font/WOFF2/{Font.h => Typeface.h} | 8 ++++---- Userland/Libraries/LibWeb/CSS/FontFace.cpp | 4 ++-- Userland/Libraries/LibWeb/CSS/StyleComputer.cpp | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) rename Userland/Libraries/LibGfx/Font/WOFF2/{Font.cpp => Typeface.cpp} (89%) rename Userland/Libraries/LibGfx/Font/WOFF2/{Font.h => Typeface.h} (91%) diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp index b38e967d53b..711362e1e72 100644 --- a/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp +++ b/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include extern "C" int LLVMFuzzerTestOneInput(u8 const* data, size_t size) { AK::set_debug_enabled(false); - (void)WOFF2::Font::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF2::Typeface::try_load_from_externally_owned_memory({ data, size }); return 0; } diff --git a/Tests/LibGfx/TestWOFF2.cpp b/Tests/LibGfx/TestWOFF2.cpp index f64b5bf6bee..a827a106735 100644 --- a/Tests/LibGfx/TestWOFF2.cpp +++ b/Tests/LibGfx/TestWOFF2.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #define TEST_INPUT(x) ("test-inputs/" x) @@ -12,7 +12,7 @@ TEST_CASE(tolerate_incorrect_sfnt_size) { auto file = MUST(Core::MappedFile::map(TEST_INPUT("woff2/incorrect_sfnt_size.woff2"sv))); - auto font = TRY_OR_FAIL(WOFF2::Font::try_load_from_externally_owned_memory(file->bytes())); + auto font = TRY_OR_FAIL(WOFF2::Typeface::try_load_from_externally_owned_memory(file->bytes())); EXPECT_EQ(font->family(), "Test"_string); EXPECT_EQ(font->glyph_count(), 4u); } @@ -26,7 +26,7 @@ TEST_CASE(malformed_woff2) for (auto test_input : test_inputs) { auto file = MUST(Core::MappedFile::map(test_input)); - auto font_or_error = WOFF2::Font::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF2::Typeface::try_load_from_externally_owned_memory(file->bytes()); EXPECT(font_or_error.is_error()); } } diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt index fe579b18ae9..c2d09a1bd6c 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -22,7 +22,7 @@ set(SOURCES Font/ScaledFont.cpp Font/Typeface.cpp Font/WOFF/Typeface.cpp - Font/WOFF2/Font.cpp + Font/WOFF2/Typeface.cpp GradientPainting.cpp ICC/BinaryWriter.cpp ICC/Enums.cpp diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp b/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp similarity index 89% rename from Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp rename to Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp index 5ed70f0b4da..94bce451ee2 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp +++ b/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp @@ -6,7 +6,7 @@ #define AK_DONT_REPLACE_STD #include -#include +#include #include namespace WOFF2 { @@ -54,7 +54,7 @@ private: ByteBuffer& m_buffer; }; -ErrorOr> Font::try_load_from_externally_owned_memory(ReadonlyBytes bytes) +ErrorOr> Typeface::try_load_from_externally_owned_memory(ReadonlyBytes bytes) { auto ttf_buffer = TRY(ByteBuffer::create_uninitialized(0)); auto output = WOFF2ByteBufferOut { ttf_buffer }; @@ -63,7 +63,7 @@ ErrorOr> Font::try_load_from_externally_owned_memory(Readonl return Error::from_string_literal("Failed to convert the WOFF2 font to TTF"); } auto input_font = TRY(OpenType::Typeface::try_load_from_externally_owned_memory(ttf_buffer.bytes())); - return adopt_ref(*new Font(input_font, move(ttf_buffer))); + return adopt_ref(*new Typeface(input_font, move(ttf_buffer))); } } diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Font.h b/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h similarity index 91% rename from Userland/Libraries/LibGfx/Font/WOFF2/Font.h rename to Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h index 79ce3a42ca7..d9cfd5a7eb5 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF2/Font.h +++ b/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h @@ -17,11 +17,11 @@ namespace WOFF2 { -class Font : public Gfx::Typeface { - AK_MAKE_NONCOPYABLE(Font); +class Typeface : public Gfx::Typeface { + AK_MAKE_NONCOPYABLE(Typeface); public: - static ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes); + static ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes); virtual Gfx::ScaledFontMetrics metrics(float x_scale, float y_scale) const override { return m_input_font->metrics(x_scale, y_scale); } virtual Gfx::ScaledGlyphMetrics glyph_metrics(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const override { return m_input_font->glyph_metrics(glyph_id, x_scale, y_scale, point_width, point_height); } @@ -44,7 +44,7 @@ public: virtual bool has_color_bitmaps() const override { return m_input_font->has_color_bitmaps(); } private: - Font(NonnullRefPtr input_font, ByteBuffer input_font_buffer) + Typeface(NonnullRefPtr input_font, ByteBuffer input_font_buffer) : m_input_font_buffer(move(input_font_buffer)) , m_input_font(move(input_font)) { diff --git a/Userland/Libraries/LibWeb/CSS/FontFace.cpp b/Userland/Libraries/LibWeb/CSS/FontFace.cpp index d0369d629cf..d4cbf3a8a46 100644 --- a/Userland/Libraries/LibWeb/CSS/FontFace.cpp +++ b/Userland/Libraries/LibWeb/CSS/FontFace.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ static NonnullRefPtr>> load_vector_fo promise->resolve(woff.release_value()); return; } - auto woff2 = WOFF2::Font::try_load_from_externally_owned_memory(data); + auto woff2 = WOFF2::Typeface::try_load_from_externally_owned_memory(data); if (!woff2.is_error()) { promise->resolve(woff2.release_value()); return; diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index 8382509d517..cd0f1859592 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -177,7 +177,7 @@ ErrorOr> FontLoader::try_load_font() } } if (mime_type == "font/woff2"sv || mime_type == "application/font-woff2"sv) { - if (auto result = WOFF2::Font::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF2::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { return result; } } @@ -189,7 +189,7 @@ ErrorOr> FontLoader::try_load_font() auto woff = WOFF::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); if (!woff.is_error()) return woff.release_value(); - auto woff2 = WOFF2::Font::try_load_from_externally_owned_memory(resource()->encoded_data()); + auto woff2 = WOFF2::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); if (!woff2.is_error()) return woff2.release_value(); return Error::from_string_literal("Automatic format detection failed");