mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:17:35 +00:00
LibGfx+LibWeb: Add ImmutableBitmap for images bitmap caching in painter
Before this change, we used Gfx::Bitmap to represent both decoded images that are not going to be mutated and bitmaps corresponding to canvases that could be mutated. This change introduces a wrapper for bitmaps that are not going to be mutated, so the painter could do caching: texture caching in the case of GPU painter and potentially scaled bitmap caching in the case of CPU painter.
This commit is contained in:
parent
abcf71a8ca
commit
f4a5c136c3
24 changed files with 146 additions and 35 deletions
|
@ -60,6 +60,7 @@ set(SOURCES
|
||||||
ImageFormats/WebPLoader.cpp
|
ImageFormats/WebPLoader.cpp
|
||||||
ImageFormats/WebPLoaderLossless.cpp
|
ImageFormats/WebPLoaderLossless.cpp
|
||||||
ImageFormats/WebPLoaderLossy.cpp
|
ImageFormats/WebPLoaderLossy.cpp
|
||||||
|
ImmutableBitmap.cpp
|
||||||
Painter.cpp
|
Painter.cpp
|
||||||
Palette.cpp
|
Palette.cpp
|
||||||
Path.cpp
|
Path.cpp
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
namespace Gfx {
|
namespace Gfx {
|
||||||
|
|
||||||
class Bitmap;
|
class Bitmap;
|
||||||
|
class ImmutableBitmap;
|
||||||
class CharacterBitmap;
|
class CharacterBitmap;
|
||||||
class Color;
|
class Color;
|
||||||
|
|
||||||
|
|
24
Userland/Libraries/LibGfx/ImmutableBitmap.cpp
Normal file
24
Userland/Libraries/LibGfx/ImmutableBitmap.cpp
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibGfx/ImmutableBitmap.h>
|
||||||
|
|
||||||
|
namespace Gfx {
|
||||||
|
|
||||||
|
static size_t s_next_immutable_bitmap_id = 0;
|
||||||
|
|
||||||
|
NonnullRefPtr<ImmutableBitmap> ImmutableBitmap::create(NonnullRefPtr<Bitmap> bitmap)
|
||||||
|
{
|
||||||
|
return adopt_ref(*new ImmutableBitmap(move(bitmap)));
|
||||||
|
}
|
||||||
|
|
||||||
|
ImmutableBitmap::ImmutableBitmap(NonnullRefPtr<Bitmap> bitmap)
|
||||||
|
: m_bitmap(move(bitmap))
|
||||||
|
, m_id(s_next_immutable_bitmap_id++)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
40
Userland/Libraries/LibGfx/ImmutableBitmap.h
Normal file
40
Userland/Libraries/LibGfx/ImmutableBitmap.h
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/Forward.h>
|
||||||
|
#include <AK/RefCounted.h>
|
||||||
|
#include <LibGfx/Bitmap.h>
|
||||||
|
#include <LibGfx/Forward.h>
|
||||||
|
#include <LibGfx/Rect.h>
|
||||||
|
|
||||||
|
namespace Gfx {
|
||||||
|
|
||||||
|
class ImmutableBitmap final : public RefCounted<ImmutableBitmap> {
|
||||||
|
public:
|
||||||
|
static NonnullRefPtr<ImmutableBitmap> create(NonnullRefPtr<Bitmap> bitmap);
|
||||||
|
|
||||||
|
~ImmutableBitmap() = default;
|
||||||
|
|
||||||
|
Bitmap const& bitmap() const { return *m_bitmap; }
|
||||||
|
|
||||||
|
size_t width() const { return m_bitmap->width(); }
|
||||||
|
size_t height() const { return m_bitmap->height(); }
|
||||||
|
|
||||||
|
IntRect rect() const { return m_bitmap->rect(); }
|
||||||
|
IntSize size() const { return m_bitmap->size(); }
|
||||||
|
|
||||||
|
size_t id() const { return m_id; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
NonnullRefPtr<Bitmap> m_bitmap;
|
||||||
|
size_t m_id;
|
||||||
|
|
||||||
|
explicit ImmutableBitmap(NonnullRefPtr<Bitmap> bitmap);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -91,7 +91,7 @@ bool ImageStyleValue::is_paintable() const
|
||||||
return image_data();
|
return image_data();
|
||||||
}
|
}
|
||||||
|
|
||||||
Gfx::Bitmap const* ImageStyleValue::bitmap(size_t frame_index, Gfx::IntSize size) const
|
Gfx::ImmutableBitmap const* ImageStyleValue::bitmap(size_t frame_index, Gfx::IntSize size) const
|
||||||
{
|
{
|
||||||
if (auto image_data = this->image_data())
|
if (auto image_data = this->image_data())
|
||||||
return image_data->bitmap(frame_index, size);
|
return image_data->bitmap(frame_index, size);
|
||||||
|
@ -128,7 +128,7 @@ void ImageStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_r
|
||||||
{
|
{
|
||||||
if (auto const* b = bitmap(m_current_frame_index, dest_rect.size().to_type<int>()); b != nullptr) {
|
if (auto const* b = bitmap(m_current_frame_index, dest_rect.size().to_type<int>()); b != nullptr) {
|
||||||
auto scaling_mode = to_gfx_scaling_mode(image_rendering, b->rect(), dest_rect.to_type<int>());
|
auto scaling_mode = to_gfx_scaling_mode(image_rendering, b->rect(), dest_rect.to_type<int>());
|
||||||
context.painter().draw_scaled_bitmap(dest_rect.to_type<int>(), *b, b->rect(), scaling_mode);
|
context.painter().draw_scaled_immutable_bitmap(dest_rect.to_type<int>(), *b, b->rect(), scaling_mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ private:
|
||||||
JS::GCPtr<HTML::SharedImageRequest> m_image_request;
|
JS::GCPtr<HTML::SharedImageRequest> m_image_request;
|
||||||
|
|
||||||
void animate();
|
void animate();
|
||||||
Gfx::Bitmap const* bitmap(size_t frame_index, Gfx::IntSize = {}) const;
|
Gfx::ImmutableBitmap const* bitmap(size_t frame_index, Gfx::IntSize = {}) const;
|
||||||
|
|
||||||
AK::URL m_url;
|
AK::URL m_url;
|
||||||
WeakPtr<DOM::Document> m_document;
|
WeakPtr<DOM::Document> m_document;
|
||||||
|
|
|
@ -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, Gfx::IntSize) const
|
RefPtr<Gfx::ImmutableBitmap> 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;
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <LibGfx/ImmutableBitmap.h>
|
||||||
#include <LibWeb/HTML/DecodedImageData.h>
|
#include <LibWeb/HTML/DecodedImageData.h>
|
||||||
|
|
||||||
namespace Web::HTML {
|
namespace Web::HTML {
|
||||||
|
@ -13,14 +14,14 @@ namespace Web::HTML {
|
||||||
class AnimatedBitmapDecodedImageData final : public DecodedImageData {
|
class AnimatedBitmapDecodedImageData final : public DecodedImageData {
|
||||||
public:
|
public:
|
||||||
struct Frame {
|
struct Frame {
|
||||||
RefPtr<Gfx::Bitmap const> bitmap;
|
RefPtr<Gfx::ImmutableBitmap> bitmap;
|
||||||
int duration { 0 };
|
int duration { 0 };
|
||||||
};
|
};
|
||||||
|
|
||||||
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, Gfx::IntSize = {}) const override;
|
virtual RefPtr<Gfx::ImmutableBitmap> 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(); }
|
||||||
|
|
|
@ -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, Gfx::IntSize = {}) const = 0;
|
virtual RefPtr<Gfx::ImmutableBitmap> 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;
|
||||||
|
|
|
@ -120,7 +120,7 @@ JS::GCPtr<Layout::Node> HTMLImageElement::create_layout_node(NonnullRefPtr<CSS::
|
||||||
return heap().allocate_without_realm<Layout::ImageBox>(document(), *this, move(style), *this);
|
return heap().allocate_without_realm<Layout::ImageBox>(document(), *this, move(style), *this);
|
||||||
}
|
}
|
||||||
|
|
||||||
RefPtr<Gfx::Bitmap const> HTMLImageElement::bitmap() const
|
RefPtr<Gfx::ImmutableBitmap> HTMLImageElement::immutable_bitmap() const
|
||||||
{
|
{
|
||||||
return current_image_bitmap();
|
return current_image_bitmap();
|
||||||
}
|
}
|
||||||
|
@ -146,7 +146,7 @@ Optional<CSSPixelFraction> HTMLImageElement::intrinsic_aspect_ratio() const
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
RefPtr<Gfx::Bitmap const> HTMLImageElement::current_image_bitmap(Gfx::IntSize size) const
|
RefPtr<Gfx::ImmutableBitmap> 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, size);
|
return data->bitmap(m_current_frame_index, size);
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <AK/ByteBuffer.h>
|
#include <AK/ByteBuffer.h>
|
||||||
#include <AK/OwnPtr.h>
|
#include <AK/OwnPtr.h>
|
||||||
#include <LibGfx/Forward.h>
|
#include <LibGfx/Forward.h>
|
||||||
|
#include <LibGfx/ImmutableBitmap.h>
|
||||||
#include <LibJS/Heap/HeapFunction.h>
|
#include <LibJS/Heap/HeapFunction.h>
|
||||||
#include <LibWeb/DOM/Document.h>
|
#include <LibWeb/DOM/Document.h>
|
||||||
#include <LibWeb/DOM/DocumentLoadEventDelayer.h>
|
#include <LibWeb/DOM/DocumentLoadEventDelayer.h>
|
||||||
|
@ -38,7 +39,8 @@ public:
|
||||||
DeprecatedString alt() const { return deprecated_attribute(HTML::AttributeNames::alt); }
|
DeprecatedString alt() const { return deprecated_attribute(HTML::AttributeNames::alt); }
|
||||||
DeprecatedString src() const { return deprecated_attribute(HTML::AttributeNames::src); }
|
DeprecatedString src() const { return deprecated_attribute(HTML::AttributeNames::src); }
|
||||||
|
|
||||||
RefPtr<Gfx::Bitmap const> bitmap() const;
|
RefPtr<Gfx::ImmutableBitmap> immutable_bitmap() const;
|
||||||
|
RefPtr<Gfx::Bitmap const> bitmap() const { return immutable_bitmap()->bitmap(); }
|
||||||
|
|
||||||
unsigned width() const;
|
unsigned width() const;
|
||||||
WebIDL::ExceptionOr<void> set_width(unsigned);
|
WebIDL::ExceptionOr<void> set_width(unsigned);
|
||||||
|
@ -89,7 +91,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<CSSPixelFraction> intrinsic_aspect_ratio() const override;
|
virtual Optional<CSSPixelFraction> intrinsic_aspect_ratio() const override;
|
||||||
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize = {}) const override;
|
virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap(Gfx::IntSize = {}) const override;
|
||||||
virtual void set_visible_in_viewport(bool) override;
|
virtual void set_visible_in_viewport(bool) override;
|
||||||
|
|
||||||
void set_lazy_load_resumption_steps(Function<void()>);
|
void set_lazy_load_resumption_steps(Function<void()>);
|
||||||
|
|
|
@ -382,7 +382,7 @@ Optional<CSSPixelFraction> HTMLObjectElement::intrinsic_aspect_ratio() const
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
RefPtr<Gfx::Bitmap const> HTMLObjectElement::current_image_bitmap(Gfx::IntSize size) const
|
RefPtr<Gfx::ImmutableBitmap> HTMLObjectElement::current_image_bitmap(Gfx::IntSize size) const
|
||||||
{
|
{
|
||||||
if (auto image_data = this->image_data())
|
if (auto image_data = this->image_data())
|
||||||
return image_data->bitmap(0, size);
|
return image_data->bitmap(0, size);
|
||||||
|
|
|
@ -76,7 +76,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<CSSPixelFraction> intrinsic_aspect_ratio() const override;
|
virtual Optional<CSSPixelFraction> intrinsic_aspect_ratio() const override;
|
||||||
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize = {}) const override;
|
virtual RefPtr<Gfx::ImmutableBitmap> 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 };
|
||||||
|
|
|
@ -159,7 +159,7 @@ void SharedImageRequest::handle_successful_fetch(AK::URL const& url_string, Stri
|
||||||
Vector<AnimatedBitmapDecodedImageData::Frame> frames;
|
Vector<AnimatedBitmapDecodedImageData::Frame> frames;
|
||||||
for (auto& frame : result.value().frames) {
|
for (auto& frame : result.value().frames) {
|
||||||
frames.append(AnimatedBitmapDecodedImageData::Frame {
|
frames.append(AnimatedBitmapDecodedImageData::Frame {
|
||||||
.bitmap = frame.bitmap,
|
.bitmap = Gfx::ImmutableBitmap::create(*frame.bitmap),
|
||||||
.duration = static_cast<int>(frame.duration),
|
.duration = static_cast<int>(frame.duration),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
virtual Optional<CSSPixels> intrinsic_height() const = 0;
|
virtual Optional<CSSPixels> intrinsic_height() const = 0;
|
||||||
virtual Optional<CSSPixelFraction> intrinsic_aspect_ratio() const = 0;
|
virtual Optional<CSSPixelFraction> intrinsic_aspect_ratio() const = 0;
|
||||||
|
|
||||||
virtual RefPtr<Gfx::Bitmap const> current_image_bitmap(Gfx::IntSize) const = 0;
|
virtual RefPtr<Gfx::ImmutableBitmap> current_image_bitmap(Gfx::IntSize) const = 0;
|
||||||
virtual void set_visible_in_viewport(bool) = 0;
|
virtual void set_visible_in_viewport(bool) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ void ImagePaintable::paint(PaintContext& context, PaintPhase phase) const
|
||||||
(int)scaled_bitmap_height
|
(int)scaled_bitmap_height
|
||||||
};
|
};
|
||||||
|
|
||||||
context.painter().draw_scaled_bitmap(draw_rect.intersected(image_int_rect), *bitmap, bitmap_rect.intersected(bitmap_intersect), scaling_mode);
|
context.painter().draw_scaled_immutable_bitmap(draw_rect.intersected(image_int_rect), *bitmap, bitmap_rect.intersected(bitmap_intersect), scaling_mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,6 +64,13 @@ CommandResult PaintingCommandExecutorCPU::draw_scaled_bitmap(Gfx::IntRect const&
|
||||||
return CommandResult::Continue;
|
return CommandResult::Continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CommandResult PaintingCommandExecutorCPU::draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const& immutable_bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode)
|
||||||
|
{
|
||||||
|
auto& painter = this->painter();
|
||||||
|
painter.draw_scaled_bitmap(dst_rect, immutable_bitmap.bitmap(), src_rect, 1, scaling_mode);
|
||||||
|
return CommandResult::Continue;
|
||||||
|
}
|
||||||
|
|
||||||
CommandResult PaintingCommandExecutorCPU::set_clip_rect(Gfx::IntRect const& rect)
|
CommandResult PaintingCommandExecutorCPU::set_clip_rect(Gfx::IntRect const& rect)
|
||||||
{
|
{
|
||||||
auto& painter = this->painter();
|
auto& painter = this->painter();
|
||||||
|
|
|
@ -17,6 +17,7 @@ public:
|
||||||
CommandResult draw_text(Gfx::IntRect const& rect, String const& raw_text, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) override;
|
CommandResult draw_text(Gfx::IntRect const& rect, String const& raw_text, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) override;
|
||||||
CommandResult fill_rect(Gfx::IntRect const& rect, Color const&) override;
|
CommandResult fill_rect(Gfx::IntRect const& rect, Color const&) override;
|
||||||
CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
||||||
|
CommandResult draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const&, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
||||||
CommandResult set_clip_rect(Gfx::IntRect const& rect) override;
|
CommandResult set_clip_rect(Gfx::IntRect const& rect) override;
|
||||||
CommandResult clear_clip_rect() override;
|
CommandResult clear_clip_rect() override;
|
||||||
CommandResult set_font(Gfx::Font const&) override;
|
CommandResult set_font(Gfx::Font const&) override;
|
||||||
|
|
|
@ -44,25 +44,30 @@ CommandResult PaintingCommandExecutorGPU::fill_rect(Gfx::IntRect const& rect, Co
|
||||||
return CommandResult::Continue;
|
return CommandResult::Continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandResult PaintingCommandExecutorGPU::draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode)
|
static AccelGfx::Painter::ScalingMode to_accelgfx_scaling_mode(Gfx::Painter::ScalingMode scaling_mode)
|
||||||
{
|
{
|
||||||
// FIXME: We should avoid using Gfx::Painter specific enums in painting commands
|
|
||||||
AccelGfx::Painter::ScalingMode accel_scaling_mode;
|
|
||||||
switch (scaling_mode) {
|
switch (scaling_mode) {
|
||||||
case Gfx::Painter::ScalingMode::NearestNeighbor:
|
case Gfx::Painter::ScalingMode::NearestNeighbor:
|
||||||
case Gfx::Painter::ScalingMode::BoxSampling:
|
case Gfx::Painter::ScalingMode::BoxSampling:
|
||||||
case Gfx::Painter::ScalingMode::SmoothPixels:
|
case Gfx::Painter::ScalingMode::SmoothPixels:
|
||||||
case Gfx::Painter::ScalingMode::None:
|
case Gfx::Painter::ScalingMode::None:
|
||||||
accel_scaling_mode = AccelGfx::Painter::ScalingMode::NearestNeighbor;
|
return AccelGfx::Painter::ScalingMode::NearestNeighbor;
|
||||||
break;
|
|
||||||
case Gfx::Painter::ScalingMode::BilinearBlend:
|
case Gfx::Painter::ScalingMode::BilinearBlend:
|
||||||
accel_scaling_mode = AccelGfx::Painter::ScalingMode::Bilinear;
|
return AccelGfx::Painter::ScalingMode::Bilinear;
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
VERIFY_NOT_REACHED();
|
VERIFY_NOT_REACHED();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
painter().draw_scaled_bitmap(dst_rect, bitmap, src_rect, accel_scaling_mode);
|
CommandResult PaintingCommandExecutorGPU::draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode)
|
||||||
|
{
|
||||||
|
painter().draw_scaled_bitmap(dst_rect, bitmap, src_rect, to_accelgfx_scaling_mode(scaling_mode));
|
||||||
|
return CommandResult::Continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
CommandResult PaintingCommandExecutorGPU::draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const& immutable_bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode)
|
||||||
|
{
|
||||||
|
painter().draw_scaled_bitmap(dst_rect, immutable_bitmap.bitmap(), src_rect, to_accelgfx_scaling_mode(scaling_mode));
|
||||||
return CommandResult::Continue;
|
return CommandResult::Continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ public:
|
||||||
CommandResult draw_text(Gfx::IntRect const& rect, String const& raw_text, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) override;
|
CommandResult draw_text(Gfx::IntRect const& rect, String const& raw_text, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) override;
|
||||||
CommandResult fill_rect(Gfx::IntRect const& rect, Color const&) override;
|
CommandResult fill_rect(Gfx::IntRect const& rect, Color const&) override;
|
||||||
CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
||||||
|
CommandResult draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const&, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) override;
|
||||||
CommandResult set_clip_rect(Gfx::IntRect const& rect) override;
|
CommandResult set_clip_rect(Gfx::IntRect const& rect) override;
|
||||||
CommandResult clear_clip_rect() override;
|
CommandResult clear_clip_rect() override;
|
||||||
CommandResult set_font(Gfx::Font const&) override;
|
CommandResult set_font(Gfx::Font const&) override;
|
||||||
|
|
|
@ -157,6 +157,16 @@ void RecordingPainter::draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bit
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RecordingPainter::draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode)
|
||||||
|
{
|
||||||
|
push_command(DrawScaledImmutableBitmap {
|
||||||
|
.dst_rect = state().translation.map(dst_rect),
|
||||||
|
.bitmap = bitmap,
|
||||||
|
.src_rect = src_rect,
|
||||||
|
.scaling_mode = scaling_mode,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void RecordingPainter::draw_line(Gfx::IntPoint from, Gfx::IntPoint to, Color color, int thickness, Gfx::Painter::LineStyle style, Color alternate_color)
|
void RecordingPainter::draw_line(Gfx::IntPoint from, Gfx::IntPoint to, Color color, int thickness, Gfx::Painter::LineStyle style, Color alternate_color)
|
||||||
{
|
{
|
||||||
push_command(DrawLine {
|
push_command(DrawLine {
|
||||||
|
@ -436,6 +446,9 @@ void RecordingPainter::execute(PaintingCommandExecutor& executor)
|
||||||
[&](DrawScaledBitmap const& command) {
|
[&](DrawScaledBitmap const& command) {
|
||||||
return executor.draw_scaled_bitmap(command.dst_rect, command.bitmap, command.src_rect, command.scaling_mode);
|
return executor.draw_scaled_bitmap(command.dst_rect, command.bitmap, command.src_rect, command.scaling_mode);
|
||||||
},
|
},
|
||||||
|
[&](DrawScaledImmutableBitmap const& command) {
|
||||||
|
return executor.draw_scaled_immutable_bitmap(command.dst_rect, command.bitmap, command.src_rect, command.scaling_mode);
|
||||||
|
},
|
||||||
[&](SetClipRect const& command) {
|
[&](SetClipRect const& command) {
|
||||||
return executor.set_clip_rect(command.rect);
|
return executor.set_clip_rect(command.rect);
|
||||||
},
|
},
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <LibGfx/Forward.h>
|
#include <LibGfx/Forward.h>
|
||||||
#include <LibGfx/Gradients.h>
|
#include <LibGfx/Gradients.h>
|
||||||
#include <LibGfx/GrayscaleBitmap.h>
|
#include <LibGfx/GrayscaleBitmap.h>
|
||||||
|
#include <LibGfx/ImmutableBitmap.h>
|
||||||
#include <LibGfx/PaintStyle.h>
|
#include <LibGfx/PaintStyle.h>
|
||||||
#include <LibGfx/Painter.h>
|
#include <LibGfx/Painter.h>
|
||||||
#include <LibGfx/Palette.h>
|
#include <LibGfx/Palette.h>
|
||||||
|
@ -76,6 +77,15 @@ struct DrawScaledBitmap {
|
||||||
[[nodiscard]] Gfx::IntRect bounding_rect() const { return dst_rect; }
|
[[nodiscard]] Gfx::IntRect bounding_rect() const { return dst_rect; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct DrawScaledImmutableBitmap {
|
||||||
|
Gfx::IntRect dst_rect;
|
||||||
|
NonnullRefPtr<Gfx::ImmutableBitmap> bitmap;
|
||||||
|
Gfx::IntRect src_rect;
|
||||||
|
Gfx::Painter::ScalingMode scaling_mode;
|
||||||
|
|
||||||
|
[[nodiscard]] Gfx::IntRect bounding_rect() const { return dst_rect; }
|
||||||
|
};
|
||||||
|
|
||||||
struct SetClipRect {
|
struct SetClipRect {
|
||||||
Gfx::IntRect rect;
|
Gfx::IntRect rect;
|
||||||
};
|
};
|
||||||
|
@ -314,6 +324,7 @@ using PaintingCommand = Variant<
|
||||||
DrawText,
|
DrawText,
|
||||||
FillRect,
|
FillRect,
|
||||||
DrawScaledBitmap,
|
DrawScaledBitmap,
|
||||||
|
DrawScaledImmutableBitmap,
|
||||||
SetClipRect,
|
SetClipRect,
|
||||||
ClearClipRect,
|
ClearClipRect,
|
||||||
SetFont,
|
SetFont,
|
||||||
|
@ -351,6 +362,7 @@ public:
|
||||||
virtual CommandResult draw_text(Gfx::IntRect const&, String const&, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) = 0;
|
virtual CommandResult draw_text(Gfx::IntRect const&, String const&, Gfx::TextAlignment alignment, Color const&, Gfx::TextElision, Gfx::TextWrapping, Optional<NonnullRefPtr<Gfx::Font>> const&) = 0;
|
||||||
virtual CommandResult fill_rect(Gfx::IntRect const&, Color const&) = 0;
|
virtual CommandResult fill_rect(Gfx::IntRect const&, Color const&) = 0;
|
||||||
virtual CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) = 0;
|
virtual CommandResult draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) = 0;
|
||||||
|
virtual CommandResult draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const&, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode) = 0;
|
||||||
virtual CommandResult set_clip_rect(Gfx::IntRect const& rect) = 0;
|
virtual CommandResult set_clip_rect(Gfx::IntRect const& rect) = 0;
|
||||||
virtual CommandResult clear_clip_rect() = 0;
|
virtual CommandResult clear_clip_rect() = 0;
|
||||||
virtual CommandResult set_font(Gfx::Font const& font) = 0;
|
virtual CommandResult set_font(Gfx::Font const& font) = 0;
|
||||||
|
@ -435,6 +447,7 @@ public:
|
||||||
void draw_rect(Gfx::IntRect const& rect, Color color, bool rough = false);
|
void draw_rect(Gfx::IntRect const& rect, Color color, bool rough = false);
|
||||||
|
|
||||||
void draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode = Gfx::Painter::ScalingMode::NearestNeighbor);
|
void draw_scaled_bitmap(Gfx::IntRect const& dst_rect, Gfx::Bitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode = Gfx::Painter::ScalingMode::NearestNeighbor);
|
||||||
|
void draw_scaled_immutable_bitmap(Gfx::IntRect const& dst_rect, Gfx::ImmutableBitmap const& bitmap, Gfx::IntRect const& src_rect, Gfx::Painter::ScalingMode scaling_mode = Gfx::Painter::ScalingMode::NearestNeighbor);
|
||||||
|
|
||||||
void draw_line(Gfx::IntPoint from, Gfx::IntPoint to, Color color, int thickness = 1, Gfx::Painter::LineStyle style = Gfx::Painter::LineStyle::Solid, Color alternate_color = Color::Transparent);
|
void draw_line(Gfx::IntPoint from, Gfx::IntPoint to, Color color, int thickness = 1, Gfx::Painter::LineStyle style = Gfx::Painter::LineStyle::Solid, Color alternate_color = Color::Transparent);
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,9 @@ SVGDecodedImageData::SVGDecodedImageData(NonnullOwnPtr<Page> page, NonnullOwnPtr
|
||||||
|
|
||||||
SVGDecodedImageData::~SVGDecodedImageData() = default;
|
SVGDecodedImageData::~SVGDecodedImageData() = default;
|
||||||
|
|
||||||
void SVGDecodedImageData::render(Gfx::IntSize size) const
|
RefPtr<Gfx::Bitmap> SVGDecodedImageData::render(Gfx::IntSize size) const
|
||||||
{
|
{
|
||||||
|
auto bitmap = Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, size).release_value_but_fixme_should_propagate_errors();
|
||||||
VERIFY(m_document->navigable());
|
VERIFY(m_document->navigable());
|
||||||
m_document->navigable()->set_viewport_rect({ 0, 0, size.width(), size.height() });
|
m_document->navigable()->set_viewport_rect({ 0, 0, size.width(), size.height() });
|
||||||
m_document->update_layout();
|
m_document->update_layout();
|
||||||
|
@ -112,21 +113,22 @@ void SVGDecodedImageData::render(Gfx::IntSize size) const
|
||||||
|
|
||||||
m_document->paintable()->paint_all_phases(context);
|
m_document->paintable()->paint_all_phases(context);
|
||||||
|
|
||||||
Painting::PaintingCommandExecutorCPU executor { *m_bitmap };
|
Painting::PaintingCommandExecutorCPU executor { *bitmap };
|
||||||
recording_painter.execute(executor);
|
recording_painter.execute(executor);
|
||||||
|
|
||||||
|
return bitmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
RefPtr<Gfx::Bitmap const> SVGDecodedImageData::bitmap(size_t, Gfx::IntSize size) const
|
RefPtr<Gfx::ImmutableBitmap> SVGDecodedImageData::bitmap(size_t, Gfx::IntSize size) const
|
||||||
{
|
{
|
||||||
if (size.is_empty())
|
if (size.is_empty())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
if (m_bitmap && m_bitmap->size() == size)
|
if (m_immutable_bitmap && m_immutable_bitmap->size() == size)
|
||||||
return m_bitmap;
|
return m_immutable_bitmap;
|
||||||
|
|
||||||
m_bitmap = Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, size).release_value_but_fixme_should_propagate_errors();
|
m_immutable_bitmap = Gfx::ImmutableBitmap::create(*render(size));
|
||||||
render(size);
|
return m_immutable_bitmap;
|
||||||
return m_bitmap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Optional<CSSPixels> SVGDecodedImageData::intrinsic_width() const
|
Optional<CSSPixels> SVGDecodedImageData::intrinsic_width() const
|
||||||
|
|
|
@ -16,7 +16,7 @@ public:
|
||||||
static ErrorOr<NonnullRefPtr<SVGDecodedImageData>> create(Page&, AK::URL const&, ByteBuffer encoded_svg);
|
static ErrorOr<NonnullRefPtr<SVGDecodedImageData>> create(Page&, AK::URL const&, ByteBuffer encoded_svg);
|
||||||
virtual ~SVGDecodedImageData() override;
|
virtual ~SVGDecodedImageData() override;
|
||||||
|
|
||||||
virtual RefPtr<Gfx::Bitmap const> bitmap(size_t frame_index, Gfx::IntSize) const override;
|
virtual RefPtr<Gfx::ImmutableBitmap> 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;
|
||||||
|
@ -34,8 +34,8 @@ private:
|
||||||
class SVGPageClient;
|
class SVGPageClient;
|
||||||
SVGDecodedImageData(NonnullOwnPtr<Page>, NonnullOwnPtr<SVGPageClient>, JS::Handle<DOM::Document>, JS::Handle<SVG::SVGSVGElement>);
|
SVGDecodedImageData(NonnullOwnPtr<Page>, NonnullOwnPtr<SVGPageClient>, JS::Handle<DOM::Document>, JS::Handle<SVG::SVGSVGElement>);
|
||||||
|
|
||||||
void render(Gfx::IntSize) const;
|
RefPtr<Gfx::Bitmap> render(Gfx::IntSize) const;
|
||||||
mutable RefPtr<Gfx::Bitmap> m_bitmap;
|
mutable RefPtr<Gfx::ImmutableBitmap> m_immutable_bitmap;
|
||||||
|
|
||||||
NonnullOwnPtr<Page> m_page;
|
NonnullOwnPtr<Page> m_page;
|
||||||
NonnullOwnPtr<SVGPageClient> m_page_client;
|
NonnullOwnPtr<SVGPageClient> m_page_client;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue