diff --git a/Libraries/LibGfx/Font/WOFF/Loader.cpp b/Libraries/LibGfx/Font/WOFF/Loader.cpp index fcc9717dd77..0d5445d3e42 100644 --- a/Libraries/LibGfx/Font/WOFF/Loader.cpp +++ b/Libraries/LibGfx/Font/WOFF/Loader.cpp @@ -70,7 +70,7 @@ static u16 pow_2_less_than_or_equal(u16 x) ErrorOr> try_load_from_resource(Core::Resource const& resource, unsigned index) { - return try_load_from_externally_owned_memory(resource.data(), index); + return try_load_from_bytes(resource.data(), index); } using Uint8 = u8; @@ -102,7 +102,7 @@ struct [[gnu::packed]] TableRecord { }; static_assert(AssertSize()); -ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes buffer, unsigned int index) +ErrorOr> try_load_from_bytes(ReadonlyBytes buffer, unsigned int index) { FixedMemoryStream stream(buffer); auto header = TRY(stream.read_value
()); diff --git a/Libraries/LibGfx/Font/WOFF/Loader.h b/Libraries/LibGfx/Font/WOFF/Loader.h index 3069c581473..4a16a23b90d 100644 --- a/Libraries/LibGfx/Font/WOFF/Loader.h +++ b/Libraries/LibGfx/Font/WOFF/Loader.h @@ -14,6 +14,6 @@ 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); +ErrorOr> try_load_from_bytes(ReadonlyBytes bytes, unsigned index = 0); } diff --git a/Libraries/LibGfx/Font/WOFF2/Loader.cpp b/Libraries/LibGfx/Font/WOFF2/Loader.cpp index 49e09d9669e..2b94963de18 100644 --- a/Libraries/LibGfx/Font/WOFF2/Loader.cpp +++ b/Libraries/LibGfx/Font/WOFF2/Loader.cpp @@ -53,7 +53,7 @@ private: ByteBuffer& m_buffer; }; -ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes bytes) +ErrorOr> try_load_from_bytes(ReadonlyBytes bytes) { auto ttf_buffer = TRY(ByteBuffer::create_uninitialized(0)); auto output = WOFF2ByteBufferOut { ttf_buffer }; diff --git a/Libraries/LibGfx/Font/WOFF2/Loader.h b/Libraries/LibGfx/Font/WOFF2/Loader.h index 61469fde7fa..4b880ea8102 100644 --- a/Libraries/LibGfx/Font/WOFF2/Loader.h +++ b/Libraries/LibGfx/Font/WOFF2/Loader.h @@ -13,6 +13,6 @@ namespace WOFF2 { -ErrorOr> try_load_from_externally_owned_memory(ReadonlyBytes); +ErrorOr> try_load_from_bytes(ReadonlyBytes); } diff --git a/Libraries/LibWeb/CSS/FontFace.cpp b/Libraries/LibWeb/CSS/FontFace.cpp index 15ad26de8c7..28e740fb475 100644 --- a/Libraries/LibWeb/CSS/FontFace.cpp +++ b/Libraries/LibWeb/CSS/FontFace.cpp @@ -41,12 +41,12 @@ static NonnullRefPtr>> load_vec promise->resolve(ttf.release_value()); return; } - auto woff = WOFF::try_load_from_externally_owned_memory(data); + auto woff = WOFF::try_load_from_bytes(data); if (!woff.is_error()) { promise->resolve(woff.release_value()); return; } - auto woff2 = WOFF2::try_load_from_externally_owned_memory(data); + auto woff2 = WOFF2::try_load_from_bytes(data); if (!woff2.is_error()) { promise->resolve(woff2.release_value()); return; diff --git a/Libraries/LibWeb/CSS/StyleComputer.cpp b/Libraries/LibWeb/CSS/StyleComputer.cpp index 4326b256ee7..3da39fd3874 100644 --- a/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -274,12 +274,12 @@ ErrorOr> FontLoader::try_load_font() } } if (mime_type->essence() == "font/woff"sv || mime_type->essence() == "application/font-woff"sv) { - if (auto result = WOFF::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF::try_load_from_bytes(resource()->encoded_data()); !result.is_error()) { return result; } } if (mime_type->essence() == "font/woff2"sv || mime_type->essence() == "application/font-woff2"sv) { - if (auto result = WOFF2::try_load_from_externally_owned_memory(resource()->encoded_data()); !result.is_error()) { + if (auto result = WOFF2::try_load_from_bytes(resource()->encoded_data()); !result.is_error()) { return result; } } diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF.cpp index b3150d91798..b4b8d84c70e 100644 --- a/Meta/Lagom/Fuzzers/FuzzWOFF.cpp +++ b/Meta/Lagom/Fuzzers/FuzzWOFF.cpp @@ -10,6 +10,6 @@ extern "C" int LLVMFuzzerTestOneInput(u8 const* data, size_t size) { AK::set_debug_enabled(false); - (void)WOFF::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF::try_load_from_bytes({ data, size }); return 0; } diff --git a/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp b/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp index 299d46df4a2..9169dc663aa 100644 --- a/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp +++ b/Meta/Lagom/Fuzzers/FuzzWOFF2.cpp @@ -10,6 +10,6 @@ extern "C" int LLVMFuzzerTestOneInput(u8 const* data, size_t size) { AK::set_debug_enabled(false); - (void)WOFF2::try_load_from_externally_owned_memory({ data, size }); + (void)WOFF2::try_load_from_bytes({ data, size }); return 0; } diff --git a/Tests/LibGfx/TestWOFF.cpp b/Tests/LibGfx/TestWOFF.cpp index fbab2798651..be2943e0747 100644 --- a/Tests/LibGfx/TestWOFF.cpp +++ b/Tests/LibGfx/TestWOFF.cpp @@ -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::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF::try_load_from_bytes(file->bytes()); EXPECT(font_or_error.is_error()); } } diff --git a/Tests/LibGfx/TestWOFF2.cpp b/Tests/LibGfx/TestWOFF2.cpp index 1a8c7021a70..9ff068361a6 100644 --- a/Tests/LibGfx/TestWOFF2.cpp +++ b/Tests/LibGfx/TestWOFF2.cpp @@ -23,7 +23,7 @@ struct Global { 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::try_load_from_externally_owned_memory(file->bytes())); + auto font = TRY_OR_FAIL(WOFF2::try_load_from_bytes(file->bytes())); EXPECT_EQ(font->family(), "Test"_string); EXPECT_EQ(font->glyph_count(), 4u); } @@ -37,7 +37,7 @@ TEST_CASE(malformed_woff2) for (auto test_input : test_inputs) { auto file = MUST(Core::MappedFile::map(test_input)); - auto font_or_error = WOFF2::try_load_from_externally_owned_memory(file->bytes()); + auto font_or_error = WOFF2::try_load_from_bytes(file->bytes()); EXPECT(font_or_error.is_error()); } }