RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:38:11 +00:00
Code Issues Activity Actions

LibWeb: Have ImageProvider bitmap getter take optional size argument

Browse source 
This allows the painting subsystem to request a bitmap with the exact
size needed for painting, instead of being limited to "just give me a
bitmap" (which was perfectly enough for raster images, but not for
vector graphics).
This commit is contained in:
Andreas Kling 2023-05-20 16:40:44 +02:00
parent 6f46bff4df
commit e63f68661f
11 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/HTML/AnimatedBitmapDecodedImageData.cpp
View file

@ -23,7 +23,7 @@ AnimatedBitmapDecodedImageData::AnimatedBitmapDecodedImageData(Vector<Frame>&& f
AnimatedBitmapDecodedImageData::~AnimatedBitmapDecodedImageData() = default; AnimatedBitmapDecodedImageData::~AnimatedBitmapDecodedImageData() = default;
RefPtr<Gfx::Bitmap const> AnimatedBitmapDecodedImageData::bitmap(size_t frame_index) const RefPtr<Gfx::Bitmap const> AnimatedBitmapDecodedImageData::bitmap(size_t frame_index, Gfx::IntSize) const
{ {
if (frame_index >= m_frames.size()) if (frame_index >= m_frames.size())
return nullptr; return nullptr;

2
Userland/Libraries/LibWeb/HTML/AnimatedBitmapDecodedImageData.h
View file

@ -20,7 +20,7 @@ public:
static ErrorOr<NonnullRefPtr<AnimatedBitmapDecodedImageData>> create(Vector<Frame>&&, size_t loop_count, bool animated); static ErrorOr<NonnullRefPtr<AnimatedBitmapDecodedImageData>> create(Vector<Frame>&&, size_t loop_count, bool animated);
virtual ~AnimatedBitmapDecodedImageData() override; virtual ~AnimatedBitmapDecodedImageData() override;
virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index) const override; virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index, Gfx::IntSize = {}) const override;
virtual int frame_duration(size_t frame_index) const override; virtual int frame_duration(size_t frame_index) const override;
virtual size_t frame_count() const override { return m_frames.size(); } virtual size_t frame_count() const override { return m_frames.size(); }

4
Userland/Libraries/LibWeb/HTML/DecodedImageData.h
View file

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <LibGfx/Forward.h> #include <LibGfx/Size.h>
#include <LibJS/Heap/Cell.h> #include <LibJS/Heap/Cell.h>
#include <LibWeb/PixelUnits.h> #include <LibWeb/PixelUnits.h>
@ -18,7 +18,7 @@ class DecodedImageData : public RefCounted<DecodedImageData> {
public: public:
virtual ~DecodedImageData(); virtual ~DecodedImageData();
virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index) const = 0; virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index, Gfx::IntSize = {}) const = 0;
virtual int frame_duration(size_t frame_index) const = 0; virtual int frame_duration(size_t frame_index) const = 0;
virtual size_t frame_count() const = 0; virtual size_t frame_count() const = 0;

4
Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp
View file

@ -132,10 +132,10 @@ Optional<float> HTMLImageElement::intrinsic_aspect_ratio() const
return {}; return {};
} }
RefPtr<Gfx::Bitmap const> HTMLImageElement::current_image_bitmap() const RefPtr<Gfx::Bitmap const> HTMLImageElement::current_image_bitmap(Gfx::IntSize size) const
{ {
if (auto data = m_current_request->image_data()) if (auto data = m_current_request->image_data())
return data->bitmap(m_current_frame_index); return data->bitmap(m_current_frame_index, size);
return nullptr; return nullptr;
} }

2
Userland/Libraries/LibWeb/HTML/HTMLImageElement.h
View file

@ -81,7 +81,7 @@ public:
virtual Optional<CSSPixels> intrinsic_width() const override; virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override; virtual Optional<CSSPixels> intrinsic_height() const override;
virtual Optional<float> intrinsic_aspect_ratio() const override; virtual Optional<float> intrinsic_aspect_ratio() const override;
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap() const override; virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize = {}) const override;
virtual void set_visible_in_viewport(bool) override; virtual void set_visible_in_viewport(bool) override;
private: private:

2
Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp
View file

@ -371,7 +371,7 @@ Optional<float> HTMLObjectElement::intrinsic_aspect_ratio() const
return {}; return {};
} }
RefPtr<Gfx::Bitmap const> HTMLObjectElement::current_image_bitmap() const RefPtr<Gfx::Bitmap const> HTMLObjectElement::current_image_bitmap(Gfx::IntSize) const
{ {
if (m_image_loader.has_value()) if (m_image_loader.has_value())
return m_image_loader->bitmap(m_image_loader->current_frame_index()); return m_image_loader->bitmap(m_image_loader->current_frame_index());

2
Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h
View file

@ -73,7 +73,7 @@ private:
virtual Optional<CSSPixels> intrinsic_width() const override; virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override; virtual Optional<CSSPixels> intrinsic_height() const override;
virtual Optional<float> intrinsic_aspect_ratio() const override; virtual Optional<float> intrinsic_aspect_ratio() const override;
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap() const override; virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize = {}) const override;
virtual void set_visible_in_viewport(bool) override; virtual void set_visible_in_viewport(bool) override;
Representation m_representation { Representation::Unknown }; Representation m_representation { Representation::Unknown };

3
Userland/Libraries/LibWeb/Layout/ImageProvider.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <LibGfx/Size.h>
#include <LibWeb/PixelUnits.h> #include <LibWeb/PixelUnits.h>
namespace Web::Layout { namespace Web::Layout {
@ -18,7 +19,7 @@ public:
virtual Optional<CSSPixels> intrinsic_height() const = 0; virtual Optional<CSSPixels> intrinsic_height() const = 0;
virtual Optional<float> intrinsic_aspect_ratio() const = 0; virtual Optional<float> intrinsic_aspect_ratio() const = 0;
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap() const = 0; virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize) const = 0;
virtual void set_visible_in_viewport(bool) = 0; virtual void set_visible_in_viewport(bool) = 0;
}; };

4
Userland/Libraries/LibWeb/Painting/ImagePaintable.cpp
View file

@ -52,6 +52,7 @@ void ImagePaintable::paint(PaintContext& context, PaintPhase phase) const
PaintableBox::paint(context, phase); PaintableBox::paint(context, phase);
if (phase == PaintPhase::Foreground) { if (phase == PaintPhase::Foreground) {
auto image_rect = context.rounded_device_rect(absolute_rect());
if (layout_box().renders_as_alt_text()) { if (layout_box().renders_as_alt_text()) {
auto& image_element = verify_cast<HTML::HTMLImageElement>(*dom_node()); auto& image_element = verify_cast<HTML::HTMLImageElement>(*dom_node());
auto enclosing_rect = context.enclosing_device_rect(absolute_rect()).to_type<int>(); auto enclosing_rect = context.enclosing_device_rect(absolute_rect()).to_type<int>();
@ -61,8 +62,7 @@ void ImagePaintable::paint(PaintContext& context, PaintPhase phase) const
if (alt.is_empty()) if (alt.is_empty())
alt = image_element.src(); alt = image_element.src();
context.painter().draw_text(enclosing_rect, alt, Gfx::TextAlignment::Center, computed_values().color(), Gfx::TextElision::Right); context.painter().draw_text(enclosing_rect, alt, Gfx::TextAlignment::Center, computed_values().color(), Gfx::TextElision::Right);
} else if (auto bitmap = layout_box().image_provider().current_image_bitmap()) { } else if (auto bitmap = layout_box().image_provider().current_image_bitmap(image_rect.size().to_type<int>())) {
auto image_rect = context.rounded_device_rect(absolute_rect());
ScopedCornerRadiusClip corner_clip { context, context.painter(), image_rect, normalized_border_radii_data(ShrinkRadiiForBorders::Yes) }; ScopedCornerRadiusClip corner_clip { context, context.painter(), image_rect, normalized_border_radii_data(ShrinkRadiiForBorders::Yes) };
auto scaling_mode = to_gfx_scaling_mode(computed_values().image_rendering(), bitmap->rect(), image_rect.to_type<int>()); auto scaling_mode = to_gfx_scaling_mode(computed_values().image_rendering(), bitmap->rect(), image_rect.to_type<int>());
context.painter().draw_scaled_bitmap(image_rect.to_type<int>(), *bitmap, bitmap->rect(), 1.f, scaling_mode); context.painter().draw_scaled_bitmap(image_rect.to_type<int>(), *bitmap, bitmap->rect(), 1.f, scaling_mode);

2
Userland/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp
View file

@ -20,7 +20,7 @@ SVGDecodedImageData::SVGDecodedImageData()
SVGDecodedImageData::~SVGDecodedImageData() = default; SVGDecodedImageData::~SVGDecodedImageData() = default;
RefPtr<Gfx::Bitmap const> SVGDecodedImageData::bitmap(size_t) const RefPtr<Gfx::Bitmap const> SVGDecodedImageData::bitmap(size_t, Gfx::IntSize) const
{ {
return nullptr; return nullptr;
} }

2
Userland/Libraries/LibWeb/SVG/SVGDecodedImageData.h
View file

@ -15,7 +15,7 @@ public:
static ErrorOr<NonnullRefPtr<SVGDecodedImageData>> create(ByteBuffer encoded_svg); static ErrorOr<NonnullRefPtr<SVGDecodedImageData>> create(ByteBuffer encoded_svg);
virtual ~SVGDecodedImageData() override; virtual ~SVGDecodedImageData() override;
virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index) const override; virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index, Gfx::IntSize) const override;
virtual Optional<CSSPixels> intrinsic_width() const override; virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override; virtual Optional<CSSPixels> intrinsic_height() const override;