852c7a10f3
DecodedImageData::paint() used to take both a destination and a clip rectangle even though most callers passed the same value. SVG image painting used that API to wrap every nested SVG display list in save/add-clip/restore, which put an unbounded command in front of the bounded nested-list command and made offscreen SVG image content harder to cull. Move clipping to ImagePaintable, where the object-fit destination can be compared with the replaced element box. CSS image and marker painting continue to draw into their destination rect, while repeated background images keep their explicit tile clip. The scaled decoded image display-list command now stores only its destination rect and uses that as its bounds; playback still clips decoded images to that rect so bitmap rendering stays unchanged.
110 lines
3.9 KiB
C++
110 lines
3.9 KiB
C++
/*
|
|
* Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
|
|
* Copyright (c) 2026, Gregory Bertilso <gregory@ladybird.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibGfx/Bitmap.h>
|
|
#include <LibGfx/DecodedImageFrame.h>
|
|
#include <LibMedia/Sinks/DisplayingVideoSink.h>
|
|
#include <LibMedia/VideoFrame.h>
|
|
#include <LibWeb/DOM/Document.h>
|
|
#include <LibWeb/HTML/HTMLMediaElement.h>
|
|
#include <LibWeb/HTML/HTMLVideoElement.h>
|
|
#include <LibWeb/HTML/VideoTrackList.h>
|
|
#include <LibWeb/Layout/VideoBox.h>
|
|
#include <LibWeb/Painting/BorderRadiusCornerClipper.h>
|
|
#include <LibWeb/Painting/DisplayListRecorder.h>
|
|
#include <LibWeb/Painting/ReplacedElementCommon.h>
|
|
#include <LibWeb/Painting/VideoPaintable.h>
|
|
|
|
namespace Web::Painting {
|
|
|
|
NonnullRefPtr<VideoPaintable> VideoPaintable::create(Layout::VideoBox const& layout_box)
|
|
{
|
|
return adopt_ref(*new VideoPaintable(layout_box));
|
|
}
|
|
|
|
VideoPaintable::VideoPaintable(Layout::VideoBox const& layout_box)
|
|
: PaintableBox(layout_box)
|
|
{
|
|
}
|
|
|
|
void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const
|
|
{
|
|
if (!is_visible())
|
|
return;
|
|
|
|
PaintableBox::paint(context, phase);
|
|
|
|
if (phase != PaintPhase::Foreground)
|
|
return;
|
|
|
|
DisplayListRecorderStateSaver saver { context.display_list_recorder() };
|
|
|
|
auto video_rect = context.rounded_device_rect(absolute_rect());
|
|
context.display_list_recorder().add_clip_rect(video_rect.to_type<int>());
|
|
|
|
ScopedCornerRadiusClip corner_clip { context, video_rect, normalized_border_radii_data(ShrinkRadiiForBorders::Yes) };
|
|
|
|
auto const& video_element = as<HTML::HTMLVideoElement>(*dom_node());
|
|
|
|
auto const& poster_frame = video_element.poster_frame();
|
|
|
|
auto paint_bitmap = [&](auto const& bitmap) {
|
|
auto frame = Gfx::DecodedImageFrame { bitmap };
|
|
auto dst_rect = get_replaced_box_painting_area(*this, context, computed_values().object_fit(), bitmap.size());
|
|
if (dst_rect.is_empty())
|
|
return;
|
|
auto scaling_mode = to_gfx_scaling_mode(computed_values().image_rendering(), frame.size(), dst_rect.size());
|
|
context.display_list_recorder().draw_scaled_decoded_image_frame(dst_rect, move(frame), scaling_mode);
|
|
};
|
|
|
|
auto paint_video_frame = [&]() {
|
|
RefPtr<Media::VideoFrame> current;
|
|
if (auto const& sink = video_element.selected_video_track_sink())
|
|
current = sink->current_frame();
|
|
|
|
Gfx::IntSize src_size;
|
|
if (current)
|
|
src_size = current->size().to_type<int>();
|
|
else if (video_element.natural_media_size().has_value())
|
|
src_size = video_element.natural_media_size()->to_type<int>();
|
|
else
|
|
return;
|
|
|
|
auto dst_rect = get_replaced_box_painting_area(*this, context, computed_values().object_fit(), src_size);
|
|
if (dst_rect.is_empty())
|
|
return;
|
|
auto scaling_mode = to_gfx_scaling_mode(computed_values().image_rendering(), src_size, dst_rect.size());
|
|
RefPtr<Media::VideoFrame const> frame = current;
|
|
auto frame_id = const_cast<HTML::HTMLVideoElement&>(video_element).ensure_video_frame_resource_id();
|
|
context.display_list_recorder().draw_video_frame(dst_rect, frame_id, move(frame), scaling_mode);
|
|
};
|
|
|
|
auto paint_transparent_black = [&]() {
|
|
static constexpr auto transparent_black = Gfx::Color::from_bgra(0x00'00'00'00);
|
|
context.display_list_recorder().fill_rect(video_rect.to_type<int>(), transparent_black);
|
|
};
|
|
|
|
auto representation = video_element.current_representation();
|
|
|
|
switch (representation) {
|
|
case HTML::HTMLVideoElement::Representation::FirstVideoFrame:
|
|
case HTML::HTMLVideoElement::Representation::VideoFrame:
|
|
paint_video_frame();
|
|
break;
|
|
|
|
case HTML::HTMLVideoElement::Representation::PosterFrame:
|
|
VERIFY(poster_frame);
|
|
paint_bitmap(*poster_frame);
|
|
break;
|
|
|
|
case HTML::HTMLVideoElement::Representation::TransparentBlack:
|
|
paint_transparent_black();
|
|
break;
|
|
}
|
|
}
|
|
|
|
}
|