diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF.cpp index 596e8166168..4a0e488f5a2 100644 --- a/Meta/Lagom/Fuzzers/FuzzWOFF.cpp +++ b/Meta/Lagom/Fuzzers/FuzzWOFF.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)WOFF::Font::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF::Typeface::try_load_from_externally_owned_memory({ data, size }); return 0; } diff --git a/Tests/LibGfx/TestWOFF.cpp b/Tests/LibGfx/TestWOFF.cpp index 2856ac31085..6114ce094ba 100644 --- a/Tests/LibGfx/TestWOFF.cpp +++ b/Tests/LibGfx/TestWOFF.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #define TEST_INPUT(x) ("test-inputs/" x) @@ -17,7 +17,7 @@ TEST_CASE(malformed_woff) for (auto test_input : test_inputs) { auto file = MUST(Core::MappedFile::map(test_input)); - auto font_or_error = WOFF::Font::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF::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 f67128ab88c..fe579b18ae9 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -21,7 +21,7 @@ set(SOURCES Font/OpenType/Typeface.cpp Font/ScaledFont.cpp Font/Typeface.cpp - Font/WOFF/Font.cpp + Font/WOFF/Typeface.cpp Font/WOFF2/Font.cpp GradientPainting.cpp ICC/BinaryWriter.cpp diff --git a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp index 617f1f52bb7..250bd20e408 100644 --- a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp +++ b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace Gfx { @@ -52,7 +52,7 @@ void FontDatabase::load_all_fonts_from_uri(StringView uri) family.append(font); } } else if (path.has_extension(".woff"sv)) { - if (auto font_or_error = WOFF::Font::try_load_from_resource(resource); !font_or_error.is_error()) { + if (auto font_or_error = WOFF::Typeface::try_load_from_resource(resource); !font_or_error.is_error()) { auto font = font_or_error.release_value(); auto& family = m_private->typeface_by_family.ensure(font->family(), [] { return Vector> {}; diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp b/Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp similarity index 95% rename from Userland/Libraries/LibGfx/Font/WOFF/Font.cpp rename to Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp index e8d63c62b24..ffdfb5da159 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp +++ b/Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace WOFF { @@ -69,12 +69,12 @@ static u16 pow_2_less_than_or_equal(u16 x) return 1 << (sizeof(u16) * 8 - count_leading_zeroes_safe(x - 1)); } -ErrorOr> Font::try_load_from_resource(Core::Resource const& resource, unsigned index) +ErrorOr> Typeface::try_load_from_resource(Core::Resource const& resource, unsigned index) { return try_load_from_externally_owned_memory(resource.data(), index); } -ErrorOr> Font::try_load_from_externally_owned_memory(ReadonlyBytes buffer, unsigned int index) +ErrorOr> Typeface::try_load_from_externally_owned_memory(ReadonlyBytes buffer, unsigned int index) { FixedMemoryStream stream(buffer); auto header = TRY(stream.read_value
()); @@ -159,7 +159,7 @@ ErrorOr> Font::try_load_from_externally_owned_memory(Readonl return Error::from_string_literal("Invalid WOFF total sfnt size"); auto input_font = TRY(OpenType::Typeface::try_load_from_externally_owned_memory(font_buffer.bytes(), { .index = index })); - auto font = adopt_ref(*new Font(input_font, move(font_buffer))); + auto font = adopt_ref(*new Typeface(input_font, move(font_buffer))); return font; } diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Font.h b/Userland/Libraries/LibGfx/Font/WOFF/Typeface.h similarity index 87% rename from Userland/Libraries/LibGfx/Font/WOFF/Font.h rename to Userland/Libraries/LibGfx/Font/WOFF/Typeface.h index 2519431f944..8f2a2bfb9c8 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF/Font.h +++ b/Userland/Libraries/LibGfx/Font/WOFF/Typeface.h @@ -17,12 +17,12 @@ namespace WOFF { -class Font : public Gfx::Typeface { - AK_MAKE_NONCOPYABLE(Font); +class Typeface : public Gfx::Typeface { + AK_MAKE_NONCOPYABLE(Typeface); public: - static ErrorOr> try_load_from_resource(Core::Resource const&, unsigned index = 0); - static ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes, unsigned index = 0); + static ErrorOr> try_load_from_resource(Core::Resource const&, unsigned index = 0); + static ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes, unsigned index = 0); 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); } @@ -43,7 +43,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 e77010a5b5b..d0369d629cf 100644 --- a/Userland/Libraries/LibWeb/CSS/FontFace.cpp +++ b/Userland/Libraries/LibWeb/CSS/FontFace.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ static NonnullRefPtr>> load_vector_fo promise->resolve(ttf.release_value()); return; } - auto woff = WOFF::Font::try_load_from_externally_owned_memory(data); + auto woff = WOFF::Typeface::try_load_from_externally_owned_memory(data); if (!woff.is_error()) { promise->resolve(woff.release_value()); return; diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index 3fe4caed965..8382509d517 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -172,7 +172,7 @@ ErrorOr> FontLoader::try_load_font() } } if (mime_type == "font/woff"sv || mime_type == "application/font-woff"sv) { - if (auto result = WOFF::Font::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { return result; } } @@ -186,7 +186,7 @@ ErrorOr> FontLoader::try_load_font() auto ttf = OpenType::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); if (!ttf.is_error()) return ttf.release_value(); - auto woff = WOFF::Font::try_load_from_externally_owned_memory(resource()->encoded_data()); + 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());