LibWeb+Browser: Decode non-animated images out-of-process :^)

We now use the ImageDecoder service in LibWeb for everything except
GIF images (we'll have to deal with them later, ofc.)

This has a little bit of overhead but we should be able to optimize
it until it becomes negligible.

1 files changed, 26 insertions, 0 deletions

diff --git a/Libraries/LibWeb/Loader/ImageResource.cpp b/Libraries/LibWeb/Loader/ImageResource.cpp
index efacec3aa1..35a02d0e79 100644
--- a/Libraries/LibWeb/Loader/ImageResource.cpp
+++ b/Libraries/LibWeb/Loader/ImageResource.cpp
@@ -27,6 +27,7 @@
 #include <AK/Function.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
+#include <LibImageDecoderClient/Client.h>
 #include <LibWeb/Loader/ImageResource.h>
 
 namespace Web {
@@ -40,6 +41,11 @@ ImageResource::~ImageResource()
 {
 }
 
+bool ImageResource::should_decode_in_process() const
+{
+    return mime_type() == "image/gif";
+}
+
 Gfx::ImageDecoder& ImageResource::ensure_decoder()
 {
     if (!m_decoder)
@@ -47,6 +53,26 @@ Gfx::ImageDecoder& ImageResource::ensure_decoder()
     return *m_decoder;
 }
 
+const Gfx::Bitmap* ImageResource::bitmap(size_t frame_index) const
+{
+    if (!has_encoded_data())
+        return nullptr;
+
+    if (should_decode_in_process()) {
+        if (!m_decoder)
+            return nullptr;
+        if (m_decoder->is_animated())
+            return m_decoder->frame(frame_index).image;
+        return m_decoder->bitmap();
+    }
+    if (!m_decoded_image && !m_has_attempted_decode) {
+        auto image_decoder_client = ImageDecoderClient::Client::construct();
+        m_decoded_image = image_decoder_client->decode_image(encoded_data());
+        m_has_attempted_decode = true;
+    }
+    return m_decoded_image;
+}
+
 void ImageResource::update_volatility()
 {
     if (!m_decoder)