LibWeb: Add ImageProvider virtual to access the DecodedImageData

...and also the current frame index, in case of animations.

Author: awesomekling

Libraries/LibWeb/HTML/HTMLImageElement.cpp

@@ -1281,4 +1281,11 @@ bool HTMLImageElement::allows_auto_sizes() const
             || sizes->starts_with_bytes("auto,"sv, AK::CaseSensitivity::CaseInsensitive));
 }
 
+GC::Ptr<DecodedImageData> HTMLImageElement::decoded_image_data() const
+{
+    if (!m_current_request)
+        return nullptr;
+    return m_current_request->image_data();
+}
+
 }

Libraries/LibWeb/HTML/HTMLImageElement.h

@@ -92,7 +92,7 @@ class HTMLImageElement final
     ImageRequest& current_request() { return *m_current_request; }
     ImageRequest const& current_request() const { return *m_current_request; }
 
-    size_t current_frame_index() const { return m_current_frame_index; }
+    virtual size_t current_frame_index() const override { return m_current_frame_index; }
 
     // https://html.spec.whatwg.org/multipage/images.html#upgrade-the-pending-request-to-the-current-request
     void upgrade_pending_request_to_current_request();
@@ -108,6 +108,7 @@ class HTMLImageElement final
     virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap_sized(Gfx::IntSize) const override;
     virtual void set_visible_in_viewport(bool) override;
     virtual GC::Ptr<DOM::Element const> to_html_element() const override { return *this; }
+    virtual GC::Ptr<DecodedImageData> decoded_image_data() const override;
 
     virtual void visit_edges(Cell::Visitor&) override;
 

Libraries/LibWeb/HTML/HTMLInputElement.h

@@ -285,6 +285,8 @@ class WEB_API HTMLInputElement final
     virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap_sized(Gfx::IntSize) const override;
     virtual void set_visible_in_viewport(bool) override;
     virtual GC::Ptr<DOM::Element const> to_html_element() const override { return *this; }
+    virtual size_t current_frame_index() const override { return 0; }
+    virtual GC::Ptr<HTML::DecodedImageData> decoded_image_data() const override { return image_data(); }
 
     virtual void initialize(JS::Realm&) override;
     virtual void visit_edges(Cell::Visitor&) override;

Libraries/LibWeb/HTML/HTMLObjectElement.h

@@ -84,6 +84,8 @@ class HTMLObjectElement final
     virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap_sized(Gfx::IntSize) const override;
     virtual void set_visible_in_viewport(bool) override;
     virtual GC::Ptr<DOM::Element const> to_html_element() const override { return *this; }
+    virtual size_t current_frame_index() const override { return 0; }
+    virtual GC::Ptr<DecodedImageData> decoded_image_data() const override { return image_data(); }
 
     GC::Ptr<DecodedImageData> image_data() const;
 

Libraries/LibWeb/Layout/ImageProvider.h

@@ -19,6 +19,10 @@ class ImageProvider {
 
     virtual bool is_image_available() const = 0;
 
+    virtual size_t current_frame_index() const = 0;
+
+    virtual GC::Ptr<HTML::DecodedImageData> decoded_image_data() const = 0;
+
     virtual Optional<CSSPixels> intrinsic_width() const = 0;
     virtual Optional<CSSPixels> intrinsic_height() const = 0;
     Optional<CSSPixelSize> intrinsic_size() const;

Libraries/LibWeb/Layout/TreeBuilder.cpp

@@ -230,6 +230,12 @@ class GeneratedContentImageProvider final
         m_layout_node = layout_node;
     }
 
+    virtual size_t current_frame_index() const override { return 0; }
+    virtual GC::Ptr<HTML::DecodedImageData> decoded_image_data() const override
+    {
+        return m_image->image_data();
+    }
+
 private:
     GeneratedContentImageProvider(NonnullRefPtr<CSS::ImageStyleValue> image)
         : Client(image)

Libraries/LibWeb/SVG/SVGImageElement.cpp

@@ -282,4 +282,11 @@ void SVGImageElement::animate()
         paintable()->set_needs_display();
 }
 
+GC::Ptr<HTML::DecodedImageData> SVGImageElement::decoded_image_data() const
+{
+    if (!m_resource_request)
+        return nullptr;
+    return m_resource_request->image_data();
+}
+
 }

Libraries/LibWeb/SVG/SVGImageElement.h

@@ -13,7 +13,7 @@
 
 namespace Web::SVG {
 
-class SVGImageElement
+class SVGImageElement final
     : public SVGGraphicsElement
     , public SVGURIReferenceMixin<SupportsXLinkHref::Yes>
     , public Layout::ImageProvider {
@@ -39,6 +39,8 @@ class SVGImageElement
     virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap_sized(Gfx::IntSize) const override;
     virtual void set_visible_in_viewport(bool) override { }
     virtual GC::Ptr<DOM::Element const> to_html_element() const override { return *this; }
+    virtual size_t current_frame_index() const override { return m_current_frame_index; }
+    virtual GC::Ptr<HTML::DecodedImageData> decoded_image_data() const override;
 
 protected:
     SVGImageElement(DOM::Document&, DOM::QualifiedName);