From 38dd4168bec67a697f6bb6b7751128b263dbc077 Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Mon, 17 Jul 2023 12:24:16 -0400
Subject: [PATCH] LibGfx/ICO: Decode the header in `create()` and remove
 `initialize()`

This is done as a part of #19893.
---
 Tests/LibGfx/TestImageDecoder.cpp             |  9 +------
 .../LibGfx/ImageFormats/ICOLoader.cpp         | 26 +++----------------
 .../Libraries/LibGfx/ImageFormats/ICOLoader.h |  1 -
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp
index 6b9fb5f4da..17698568e8 100644
--- a/Tests/LibGfx/TestImageDecoder.cpp
+++ b/Tests/LibGfx/TestImageDecoder.cpp
@@ -77,14 +77,7 @@ TEST_CASE(test_not_ico)
 {
     auto file = MUST(Core::MappedFile::map(TEST_INPUT("buggie.png"sv)));
     EXPECT(!Gfx::ICOImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = MUST(Gfx::ICOImageDecoderPlugin::create(file->bytes()));
-    EXPECT(plugin_decoder->initialize().is_error());
-
-    EXPECT(plugin_decoder->frame_count());
-    EXPECT(!plugin_decoder->is_animated());
-    EXPECT(!plugin_decoder->loop_count());
-
-    EXPECT(plugin_decoder->frame(0).is_error());
+    EXPECT(Gfx::ICOImageDecoderPlugin::create(file->bytes()).is_error());
 }
 
 TEST_CASE(test_bmp_embedded_in_ico)
diff --git a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
index 235b451d31..832b7ce0e8 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
@@ -138,8 +138,7 @@ static ErrorOr<void> load_ico_directory(ICOLoadingContext& context)
 
 ErrorOr<void> ICOImageDecoderPlugin::load_ico_bitmap(ICOLoadingContext& context, Optional<size_t> index)
 {
-    if (context.state < ICOLoadingContext::State::DirectoryDecoded)
-        TRY(load_ico_directory(context));
+    VERIFY(context.state >= ICOLoadingContext::State::DirectoryDecoded);
 
     size_t real_index = context.largest_index;
     if (index.has_value())
@@ -186,7 +185,9 @@ bool ICOImageDecoderPlugin::sniff(ReadonlyBytes data)
 
 ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> ICOImageDecoderPlugin::create(ReadonlyBytes data)
 {
-    return adopt_nonnull_own_or_enomem(new (nothrow) ICOImageDecoderPlugin(data.data(), data.size()));
+    auto plugin = TRY(adopt_nonnull_own_or_enomem(new (nothrow) ICOImageDecoderPlugin(data.data(), data.size())));
+    TRY(load_ico_directory(*plugin->m_context));
+    return plugin;
 }
 
 ICOImageDecoderPlugin::ICOImageDecoderPlugin(u8 const* data, size_t size)
@@ -200,28 +201,9 @@ ICOImageDecoderPlugin::~ICOImageDecoderPlugin() = default;
 
 IntSize ICOImageDecoderPlugin::size()
 {
-    if (m_context->state == ICOLoadingContext::State::Error) {
-        return {};
-    }
-
-    if (m_context->state < ICOLoadingContext::State::DirectoryDecoded) {
-        if (load_ico_directory(*m_context).is_error()) {
-            m_context->state = ICOLoadingContext::State::Error;
-            return {};
-        }
-        m_context->state = ICOLoadingContext::State::DirectoryDecoded;
-    }
-
     return { m_context->images[m_context->largest_index].width, m_context->images[m_context->largest_index].height };
 }
 
-ErrorOr<void> ICOImageDecoderPlugin::initialize()
-{
-    FixedMemoryStream stream { { m_context->data, m_context->data_size } };
-    TRY(decode_ico_header(stream));
-    return {};
-}
-
 bool ICOImageDecoderPlugin::is_animated()
 {
     return false;
diff --git a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
index d4abff02a1..db47415e9c 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
@@ -21,7 +21,6 @@ public:
 
     virtual IntSize size() override;
 
-    virtual ErrorOr<void> initialize() override;
     virtual bool is_animated() override;
     virtual size_t loop_count() override;
     virtual size_t frame_count() override;