From 2ead999f2b1e98042abb891a38879d82af5ad091 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Mon, 22 Jul 2024 14:03:58 +0300 Subject: [PATCH] LibGfx+LibWeb: Remove typeface classes for WOFF fonts This change removes wrappers inherited from Gfx::Typeface for WOFF and WOFF2 fonts. The only purpose they served is owning of ttf ByteBuffer produced by decoding a WOFF/WOFF2 font. Now new FontData class is responsible for holding ByteBuffer when a font is constructed from non-externally owned memory. --- Meta/Lagom/Fuzzers/FuzzWOFF.cpp | 4 +- Meta/Lagom/Fuzzers/FuzzWOFF2.cpp | 4 +- Tests/LibGfx/TestWOFF.cpp | 4 +- Tests/LibGfx/TestWOFF2.cpp | 6 +- Userland/Libraries/LibGfx/CMakeLists.txt | 5 +- Userland/Libraries/LibGfx/Font/FontData.cpp | 40 +++++++++++++ Userland/Libraries/LibGfx/Font/FontData.h | 31 ++++++++++ .../Libraries/LibGfx/Font/FontDatabase.cpp | 4 +- .../LibGfx/Font/OpenType/Typeface.cpp | 10 +++- .../Libraries/LibGfx/Font/OpenType/Typeface.h | 3 +- Userland/Libraries/LibGfx/Font/Typeface.h | 1 + .../Font/WOFF/{Typeface.cpp => Loader.cpp} | 12 ++-- Userland/Libraries/LibGfx/Font/WOFF/Loader.h | 19 +++++++ .../Libraries/LibGfx/Font/WOFF/Typeface.h | 56 ------------------ .../Font/WOFF2/{Typeface.cpp => Loader.cpp} | 10 ++-- Userland/Libraries/LibGfx/Font/WOFF2/Loader.h | 18 ++++++ .../Libraries/LibGfx/Font/WOFF2/Typeface.h | 57 ------------------- Userland/Libraries/LibWeb/CSS/FontFace.cpp | 8 +-- .../Libraries/LibWeb/CSS/StyleComputer.cpp | 12 ++-- 19 files changed, 154 insertions(+), 150 deletions(-) create mode 100644 Userland/Libraries/LibGfx/Font/FontData.cpp create mode 100644 Userland/Libraries/LibGfx/Font/FontData.h rename Userland/Libraries/LibGfx/Font/WOFF/{Typeface.cpp => Loader.cpp} (95%) create mode 100644 Userland/Libraries/LibGfx/Font/WOFF/Loader.h delete mode 100644 Userland/Libraries/LibGfx/Font/WOFF/Typeface.h rename Userland/Libraries/LibGfx/Font/WOFF2/{Typeface.cpp => Loader.cpp} (85%) create mode 100644 Userland/Libraries/LibGfx/Font/WOFF2/Loader.h delete mode 100644 Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF.cpp index 4a0e488f5a2..b3150d91798 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::Typeface::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF::try_load_from_externally_owned_memory({ data, size }); return 0; } diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp index 711362e1e72..299d46df4a2 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::Typeface::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF2::try_load_from_externally_owned_memory({ data, size }); return 0; } diff --git a/Tests/LibGfx/TestWOFF.cpp b/Tests/LibGfx/TestWOFF.cpp index 6114ce094ba..fbab2798651 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::Typeface::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF::try_load_from_externally_owned_memory(file->bytes()); EXPECT(font_or_error.is_error()); } } diff --git a/Tests/LibGfx/TestWOFF2.cpp b/Tests/LibGfx/TestWOFF2.cpp index a827a106735..59d787cdf12 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::Typeface::try_load_from_externally_owned_memory(file->bytes())); + auto font = TRY_OR_FAIL(WOFF2::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::Typeface::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF2::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 f963264886c..0e36ccaa06c 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -9,6 +9,7 @@ set(SOURCES FontCascadeList.cpp Font/Emoji.cpp Font/Font.cpp + Font/FontData.cpp Font/FontDatabase.cpp Font/OpenType/Cmap.cpp Font/OpenType/Glyf.cpp @@ -17,8 +18,8 @@ set(SOURCES Font/OpenType/Typeface.cpp Font/ScaledFont.cpp Font/Typeface.cpp - Font/WOFF/Typeface.cpp - Font/WOFF2/Typeface.cpp + Font/WOFF/Loader.cpp + Font/WOFF2/Loader.cpp GradientPainting.cpp ICC/BinaryWriter.cpp ICC/Enums.cpp diff --git a/Userland/Libraries/LibGfx/Font/FontData.cpp b/Userland/Libraries/LibGfx/Font/FontData.cpp new file mode 100644 index 00000000000..7865e3003ac --- /dev/null +++ b/Userland/Libraries/LibGfx/Font/FontData.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2024, Aliaksandr Kalenik + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +namespace Gfx { + +NonnullOwnPtr FontData::create_from_byte_buffer(ByteBuffer&& byte_buffer) +{ + return adopt_own(*new FontData(move(byte_buffer))); +} + +NonnullOwnPtr FontData::create_from_resource(Core::Resource const& resource) +{ + return adopt_own(*new FontData(resource)); +} + +ReadonlyBytes FontData::bytes() const +{ + return m_data.visit( + [&](ByteBuffer const& byte_buffer) { return byte_buffer.bytes(); }, + [&](Core::Resource const& resource) { + return resource.data(); + }); +} + +FontData::FontData(ByteBuffer&& byte_buffer) + : m_data(move(byte_buffer)) +{ +} + +FontData::FontData(NonnullRefPtr resource) + : m_data(move(resource)) +{ +} + +} diff --git a/Userland/Libraries/LibGfx/Font/FontData.h b/Userland/Libraries/LibGfx/Font/FontData.h new file mode 100644 index 00000000000..6afb32af14f --- /dev/null +++ b/Userland/Libraries/LibGfx/Font/FontData.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024, Aliaksandr Kalenik + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include +#include +#include +#include + +namespace Gfx { + +class FontData { +public: + static NonnullOwnPtr create_from_byte_buffer(ByteBuffer&&); + static NonnullOwnPtr create_from_resource(Core::Resource const&); + + ReadonlyBytes bytes() const; + +private: + FontData(ByteBuffer&& byte_buffer); + FontData(NonnullRefPtr resource); + + Variant> m_data; +}; + +} diff --git a/Userland/Libraries/LibGfx/Font/FontDatabase.cpp b/Userland/Libraries/LibGfx/Font/FontDatabase.cpp index 250bd20e408..d3512a4ff97 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::Typeface::try_load_from_resource(resource); !font_or_error.is_error()) { + if (auto font_or_error = WOFF::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/OpenType/Typeface.cpp b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp index f218564e2f5..135a4e6c8ea 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp +++ b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp @@ -152,8 +152,14 @@ float be_fword(u8 const* ptr) ErrorOr> Typeface::try_load_from_resource(Core::Resource const& resource, unsigned index) { - auto font = TRY(try_load_from_externally_owned_memory(resource.data(), { .index = index })); - font->m_resource = resource; + auto font_data = Gfx::FontData::create_from_resource(resource); + return try_load_from_font_data(move(font_data), { .index = index }); +} + +ErrorOr> Typeface::try_load_from_font_data(NonnullOwnPtr font_data, Options options) +{ + auto font = TRY(try_load_from_externally_owned_memory(font_data->bytes(), move(options))); + font->m_font_data = move(font_data); return font; } diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h index c3925b9db76..83b55200958 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h @@ -51,6 +51,7 @@ class Typeface : public Gfx::Typeface { public: using Options = FontOptions; static ErrorOr> try_load_from_resource(Core::Resource const&, unsigned index = 0); + static ErrorOr> try_load_from_font_data(NonnullOwnPtr, Options options = {}); static ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes, Options options = {}); virtual Gfx::ScaledFontMetrics metrics(float x_scale, float y_scale) const override; @@ -144,7 +145,7 @@ private: { } - RefPtr m_resource; + OwnPtr m_font_data; // These are stateful wrappers around non-owning slices Head m_head; diff --git a/Userland/Libraries/LibGfx/Font/Typeface.h b/Userland/Libraries/LibGfx/Font/Typeface.h index 002964d4268..3854d3ae24d 100644 --- a/Userland/Libraries/LibGfx/Font/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/Typeface.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp b/Userland/Libraries/LibGfx/Font/WOFF/Loader.cpp similarity index 95% rename from Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp rename to Userland/Libraries/LibGfx/Font/WOFF/Loader.cpp index ffdfb5da159..1c0640ec664 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF/Typeface.cpp +++ b/Userland/Libraries/LibGfx/Font/WOFF/Loader.cpp @@ -7,11 +7,10 @@ #include #include -#include #include #include #include -#include +#include namespace WOFF { @@ -69,12 +68,12 @@ static u16 pow_2_less_than_or_equal(u16 x) return 1 << (sizeof(u16) * 8 - count_leading_zeroes_safe(x - 1)); } -ErrorOr> Typeface::try_load_from_resource(Core::Resource const& resource, unsigned index) +ErrorOr> try_load_from_resource(Core::Resource const& resource, unsigned index) { return try_load_from_externally_owned_memory(resource.data(), index); } -ErrorOr> Typeface::try_load_from_externally_owned_memory(ReadonlyBytes buffer, unsigned int index) +ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes buffer, unsigned int index) { FixedMemoryStream stream(buffer); auto header = TRY(stream.read_value
()); @@ -158,9 +157,8 @@ ErrorOr> Typeface::try_load_from_externally_owned_memory if (header.total_sfnt_size != expected_total_sfnt_size) 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 Typeface(input_font, move(font_buffer))); - return font; + auto font_data = Gfx::FontData::create_from_byte_buffer(move(font_buffer)); + return TRY(OpenType::Typeface::try_load_from_font_data(move(font_data), { .index = index })); } } diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Loader.h b/Userland/Libraries/LibGfx/Font/WOFF/Loader.h new file mode 100644 index 00000000000..f36bb0ff638 --- /dev/null +++ b/Userland/Libraries/LibGfx/Font/WOFF/Loader.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2022, the SerenityOS developers. + * Copyright (c) 2023, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include +#include + +namespace WOFF { + +ErrorOr> try_load_from_resource(Core::Resource const&, unsigned index = 0); +ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes, unsigned index = 0); + +} diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Typeface.h b/Userland/Libraries/LibGfx/Font/WOFF/Typeface.h deleted file mode 100644 index 8f2a2bfb9c8..00000000000 --- a/Userland/Libraries/LibGfx/Font/WOFF/Typeface.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2022, the SerenityOS developers. - * Copyright (c) 2023, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace WOFF { - -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); - - 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); } - virtual float glyph_advance(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const override { return m_input_font->glyph_advance(glyph_id, x_scale, y_scale, point_width, point_height); } - virtual float glyphs_horizontal_kerning(u32 left_glyph_id, u32 right_glyph_id, float x_scale) const override { return m_input_font->glyphs_horizontal_kerning(left_glyph_id, right_glyph_id, x_scale); } - virtual RefPtr rasterize_glyph(u32 glyph_id, float x_scale, float y_scale, Gfx::GlyphSubpixelOffset subpixel_offset) const override { return m_input_font->rasterize_glyph(glyph_id, x_scale, y_scale, subpixel_offset); } - virtual bool append_glyph_path_to(Gfx::Path& path, u32 glyph_id, float x_scale, float y_scale) const override { return m_input_font->append_glyph_path_to(path, glyph_id, x_scale, y_scale); } - - virtual u32 glyph_count() const override { return m_input_font->glyph_count(); } - virtual u16 units_per_em() const override { return m_input_font->units_per_em(); } - virtual u32 glyph_id_for_code_point(u32 code_point) const override { return m_input_font->glyph_id_for_code_point(code_point); } - virtual String family() const override { return m_input_font->family(); } - virtual String variant() const override { return m_input_font->variant(); } - virtual u16 weight() const override { return m_input_font->weight(); } - virtual u16 width() const override { return m_input_font->width(); } - virtual u8 slope() const override { return m_input_font->slope(); } - virtual bool is_fixed_width() const override { return m_input_font->is_fixed_width(); } - virtual bool has_color_bitmaps() const override { return m_input_font->has_color_bitmaps(); } - -private: - Typeface(NonnullRefPtr input_font, ByteBuffer input_font_buffer) - : m_input_font_buffer(move(input_font_buffer)) - , m_input_font(move(input_font)) - { - } - - ByteBuffer m_input_font_buffer; - NonnullRefPtr m_input_font; -}; - -} diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp b/Userland/Libraries/LibGfx/Font/WOFF2/Loader.cpp similarity index 85% rename from Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp rename to Userland/Libraries/LibGfx/Font/WOFF2/Loader.cpp index 94bce451ee2..f92976b4abd 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.cpp +++ b/Userland/Libraries/LibGfx/Font/WOFF2/Loader.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> Typeface::try_load_from_externally_owned_memory(ReadonlyBytes bytes) +ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes) { auto ttf_buffer = TRY(ByteBuffer::create_uninitialized(0)); auto output = WOFF2ByteBufferOut { ttf_buffer }; @@ -62,8 +62,10 @@ ErrorOr> Typeface::try_load_from_externally_owned_memory if (!result) { 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 Typeface(input_font, move(ttf_buffer))); + + auto font_data = Gfx::FontData::create_from_byte_buffer(move(ttf_buffer)); + auto input_font = TRY(OpenType::Typeface::try_load_from_font_data(move(font_data))); + return input_font; } } diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Loader.h b/Userland/Libraries/LibGfx/Font/WOFF2/Loader.h new file mode 100644 index 00000000000..d8610a2a5c5 --- /dev/null +++ b/Userland/Libraries/LibGfx/Font/WOFF2/Loader.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2022, Luke Wilde + * Copyright (c) 2023, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include +#include + +namespace WOFF2 { + +ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes); + +} diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h b/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h deleted file mode 100644 index d9cfd5a7eb5..00000000000 --- a/Userland/Libraries/LibGfx/Font/WOFF2/Typeface.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2022, Luke Wilde - * Copyright (c) 2023, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace WOFF2 { - -class Typeface : public Gfx::Typeface { - AK_MAKE_NONCOPYABLE(Typeface); - -public: - 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); } - virtual float glyph_advance(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const override { return m_input_font->glyph_advance(glyph_id, x_scale, y_scale, point_width, point_height); } - virtual float glyphs_horizontal_kerning(u32 left_glyph_id, u32 right_glyph_id, float x_scale) const override { return m_input_font->glyphs_horizontal_kerning(left_glyph_id, right_glyph_id, x_scale); } - virtual RefPtr rasterize_glyph(u32 glyph_id, float x_scale, float y_scale, Gfx::GlyphSubpixelOffset subpixel_offset) const override - { - return m_input_font->rasterize_glyph(glyph_id, x_scale, y_scale, subpixel_offset); - } - virtual bool append_glyph_path_to(Gfx::Path& path, u32 glyph_id, float x_scale, float y_scale) const override { return m_input_font->append_glyph_path_to(path, glyph_id, x_scale, y_scale); } - virtual u32 glyph_count() const override { return m_input_font->glyph_count(); } - virtual u16 units_per_em() const override { return m_input_font->units_per_em(); } - virtual u32 glyph_id_for_code_point(u32 code_point) const override { return m_input_font->glyph_id_for_code_point(code_point); } - virtual String family() const override { return m_input_font->family(); } - virtual String variant() const override { return m_input_font->variant(); } - virtual u16 weight() const override { return m_input_font->weight(); } - virtual u16 width() const override { return m_input_font->width(); } - virtual u8 slope() const override { return m_input_font->slope(); } - virtual bool is_fixed_width() const override { return m_input_font->is_fixed_width(); } - virtual bool has_color_bitmaps() const override { return m_input_font->has_color_bitmaps(); } - -private: - Typeface(NonnullRefPtr input_font, ByteBuffer input_font_buffer) - : m_input_font_buffer(move(input_font_buffer)) - , m_input_font(move(input_font)) - { - } - - ByteBuffer m_input_font_buffer; - NonnullRefPtr m_input_font; -}; - -} diff --git a/Userland/Libraries/LibWeb/CSS/FontFace.cpp b/Userland/Libraries/LibWeb/CSS/FontFace.cpp index d4cbf3a8a46..b08d87af9ea 100644 --- a/Userland/Libraries/LibWeb/CSS/FontFace.cpp +++ b/Userland/Libraries/LibWeb/CSS/FontFace.cpp @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -40,12 +40,12 @@ static NonnullRefPtr>> load_vector_fo promise->resolve(ttf.release_value()); return; } - auto woff = WOFF::Typeface::try_load_from_externally_owned_memory(data); + auto woff = WOFF::try_load_from_externally_owned_memory(data); if (!woff.is_error()) { promise->resolve(woff.release_value()); return; } - auto woff2 = WOFF2::Typeface::try_load_from_externally_owned_memory(data); + auto woff2 = WOFF2::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 61b6d99ff27..8d199871ff4 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -172,12 +172,12 @@ ErrorOr> FontLoader::try_load_font() } } if (mime_type == "font/woff"sv || mime_type == "application/font-woff"sv) { - if (auto result = WOFF::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { return result; } } if (mime_type == "font/woff2"sv || mime_type == "application/font-woff2"sv) { - if (auto result = WOFF2::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF2::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { return result; } } @@ -186,10 +186,10 @@ 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::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); + auto woff = WOFF::try_load_from_externally_owned_memory(resource()->encoded_data()); if (!woff.is_error()) return woff.release_value(); - auto woff2 = WOFF2::Typeface::try_load_from_externally_owned_memory(resource()->encoded_data()); + auto woff2 = WOFF2::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");