diff --git a/Userland/Libraries/LibImageDecoderClient/Client.cpp b/Userland/Libraries/LibImageDecoderClient/Client.cpp index 5ac14c63b1..f8428f060a 100644 --- a/Userland/Libraries/LibImageDecoderClient/Client.cpp +++ b/Userland/Libraries/LibImageDecoderClient/Client.cpp @@ -35,6 +35,12 @@ Client::Client() handshake(); } +void Client::die() +{ + if (on_death) + on_death(); +} + void Client::handshake() { send_sync(); diff --git a/Userland/Libraries/LibImageDecoderClient/Client.h b/Userland/Libraries/LibImageDecoderClient/Client.h index 11d0b77545..ba6664fcac 100644 --- a/Userland/Libraries/LibImageDecoderClient/Client.h +++ b/Userland/Libraries/LibImageDecoderClient/Client.h @@ -44,7 +44,7 @@ struct DecodedImage { Vector frames; }; -class Client +class Client final : public IPC::ServerConnection , public ImageDecoderClientEndpoint { C_OBJECT(Client); @@ -54,9 +54,13 @@ public: Optional decode_image(const ByteBuffer&); + Function on_death; + private: Client(); + virtual void die() override; + virtual void handle(const Messages::ImageDecoderClient::Dummy&) override; }; diff --git a/Userland/Libraries/LibWeb/Loader/ImageResource.cpp b/Userland/Libraries/LibWeb/Loader/ImageResource.cpp index ba94e8d039..001eb30877 100644 --- a/Userland/Libraries/LibWeb/Loader/ImageResource.cpp +++ b/Userland/Libraries/LibWeb/Loader/ImageResource.cpp @@ -48,6 +48,18 @@ int ImageResource::frame_duration(size_t frame_index) const return m_decoded_frames[frame_index].duration; } +static ImageDecoderClient::Client& image_decoder_client() +{ + static RefPtr image_decoder_client; + if (!image_decoder_client) { + image_decoder_client = ImageDecoderClient::Client::construct(); + image_decoder_client->on_death = [&] { + image_decoder_client = nullptr; + }; + } + return *image_decoder_client; +} + void ImageResource::decode_if_needed() const { if (!has_encoded_data()) @@ -59,8 +71,9 @@ void ImageResource::decode_if_needed() const if (!m_decoded_frames.is_empty()) return; - auto image_decoder_client = ImageDecoderClient::Client::construct(); - auto image = image_decoder_client->decode_image(encoded_data()); + NonnullRefPtr decoder = image_decoder_client(); + auto image = decoder->decode_image(encoded_data()); + if (image.has_value()) { m_loop_count = image.value().loop_count; m_animated = image.value().is_animated;