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

LibWeb: Make ImageBox ask ImageProvider for intrinsic size and ratio

Browse source 
This paves the way for ImageProvider to have something vector-based
underneath. :^)
This commit is contained in:
Andreas Kling 2023-05-20 16:27:31 +02:00
parent 4ee1e5b224
commit 8d3240d633
9 changed files with 71 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,14 +37,19 @@ int AnimatedBitmapDecodedImageData::frame_duration(size_t frame_index) const
return m_frames[frame_index].duration;
}
Optional<int> AnimatedBitmapDecodedImageData::natural_width() const
Optional<CSSPixels> AnimatedBitmapDecodedImageData::intrinsic_width() const
{
return m_frames.first().bitmap->width();
}
Optional<int> AnimatedBitmapDecodedImageData::natural_height() const
Optional<CSSPixels> AnimatedBitmapDecodedImageData::intrinsic_height() const
{
return m_frames.first().bitmap->height();
}
Optional<float> AnimatedBitmapDecodedImageData::intrinsic_aspect_ratio() const
{
return static_cast<float>(m_frames.first().bitmap->width()) / static_cast<float>(m_frames.first().bitmap->height());
}
}

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

@ -27,8 +27,9 @@ public:
virtual size_t loop_count() const override { return m_loop_count; }
virtual bool is_animated() const override { return m_animated; }
virtual Optional<int> natural_width() const override;
virtual Optional<int> natural_height() const override;
virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override;
virtual Optional<float> intrinsic_aspect_ratio() const override;
private:
AnimatedBitmapDecodedImageData(Vector<Frame>&&, size_t loop_count, bool animated);

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

@ -9,6 +9,7 @@
#include <AK/RefCounted.h>
#include <LibGfx/Forward.h>
#include <LibJS/Heap/Cell.h>
#include <LibWeb/PixelUnits.h>
namespace Web::HTML {
@ -24,8 +25,9 @@ public:
virtual size_t loop_count() const = 0;
virtual bool is_animated() const = 0;
virtual Optional<int> natural_width() const = 0;
virtual Optional<int> natural_height() const = 0;
virtual Optional<CSSPixels> intrinsic_width() const = 0;
virtual Optional<CSSPixels> intrinsic_height() const = 0;
virtual Optional<float> intrinsic_aspect_ratio() const = 0;
protected:
DecodedImageData();

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

@ -111,6 +111,27 @@ RefPtr<Gfx::Bitmap const> HTMLImageElement::bitmap() const
return current_image_bitmap();
}
Optional<CSSPixels> HTMLImageElement::intrinsic_width() const
{
if (auto image_data = m_current_request->image_data())
return image_data->intrinsic_width();
return {};
}
Optional<CSSPixels> HTMLImageElement::intrinsic_height() const
{
if (auto image_data = m_current_request->image_data())
return image_data->intrinsic_height();
return {};
}
Optional<float> HTMLImageElement::intrinsic_aspect_ratio() const
{
if (auto image_data = m_current_request->image_data())
return image_data->intrinsic_aspect_ratio();
return {};
}
RefPtr<Gfx::Bitmap const> HTMLImageElement::current_image_bitmap() const
{
if (auto data = m_current_request->image_data())

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

@ -78,6 +78,9 @@ public:
void upgrade_pending_request_to_current_request();
// ^Layout::ImageProvider
virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override;
virtual Optional<float> intrinsic_aspect_ratio() const override;
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap() const override;
virtual void set_visible_in_viewport(bool) override;

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

@ -350,6 +350,27 @@ i32 HTMLObjectElement::default_tab_index_value() const
return 0;
}
Optional<CSSPixels> HTMLObjectElement::intrinsic_width() const
{
if (m_image_loader.has_value())
return m_image_loader->bitmap(0)->width();
return {};
}
Optional<CSSPixels> HTMLObjectElement::intrinsic_height() const
{
if (m_image_loader.has_value())
return m_image_loader->bitmap(0)->height();
return {};
}
Optional<float> HTMLObjectElement::intrinsic_aspect_ratio() const
{
if (m_image_loader.has_value())
return static_cast<float>(m_image_loader->bitmap(0)->width()) / static_cast<float>(m_image_loader->bitmap(0)->height());
return {};
}
RefPtr<Gfx::Bitmap const> HTMLObjectElement::current_image_bitmap() const
{
if (m_image_loader.has_value())

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

@ -70,6 +70,9 @@ private:
virtual i32 default_tab_index_value() const override;
// ^Layout::ImageProvider
virtual Optional<CSSPixels> intrinsic_width() const override;
virtual Optional<CSSPixels> intrinsic_height() const override;
virtual Optional<float> intrinsic_aspect_ratio() const override;
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap() const override;
virtual void set_visible_in_viewport(bool) override;

15
Userland/Libraries/LibWeb/Layout/ImageBox.cpp
View file

@ -23,18 +23,9 @@ ImageBox::~ImageBox() = default;
void ImageBox::prepare_for_replaced_layout()
{
auto bitmap = m_image_provider.current_image_bitmap();
if (!bitmap) {
set_intrinsic_width(0);
set_intrinsic_height(0);
} else {
auto width = bitmap->width();
auto height = bitmap->height();
set_intrinsic_width(width);
set_intrinsic_height(height);
set_intrinsic_aspect_ratio(static_cast<float>(width) / static_cast<float>(height));
}
set_intrinsic_width(m_image_provider.intrinsic_width());
set_intrinsic_height(m_image_provider.intrinsic_height());
set_intrinsic_aspect_ratio(m_image_provider.intrinsic_aspect_ratio());
if (renders_as_alt_text()) {
auto& image_element = verify_cast<HTML::HTMLImageElement>(dom_node());

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

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