dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Replace m_surfaces stack with m_surface in DisplayListPlayer

Browse source 
After removing the AddMask display list command, no code path ever
pushes more than one surface onto the stack.
This commit is contained in:
Aliaksandr Kalenik 2026-02-23 09:30:11 +01:00 committed by Alexander Kalenik
parent 0ac72e40d4
commit 2d2af9cd3b
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Libraries/LibWeb/Painting/DisplayList.cpp
View file

@ -45,8 +45,12 @@ void DisplayListPlayer::execute(DisplayList& display_list, ScrollStateSnapshotBy
if (surface) {
surface->lock_context();
}
m_surface = surface;
auto scroll_state_snapshot = m_scroll_state_snapshots_by_display_list.get(display_list).value_or({});
execute_impl(display_list, scroll_state_snapshot, surface);
execute_impl(display_list, scroll_state_snapshot);
if (surface)
flush();
m_surface = nullptr;
if (surface) {
surface->unlock_context();
}
@ -84,21 +88,14 @@ static FloatMatrix4x4 scale_matrix_for_device_pixels(FloatMatrix4x4 matrix, floa
return matrix;
}
void DisplayListPlayer::execute_impl(DisplayList& display_list, ScrollStateSnapshot const& scroll_state, RefPtr<Gfx::PaintingSurface> surface)
void DisplayListPlayer::execute_impl(DisplayList& display_list, ScrollStateSnapshot const& scroll_state)
{
if (surface)
m_surfaces.append(*surface);
ScopeGuard guard = [&surfaces = m_surfaces, pop_surface_from_stack = !!surface] {
if (pop_surface_from_stack)
(void)surfaces.take_last();
};
auto const& commands = display_list.commands();
auto device_pixels_per_css_pixel = display_list.device_pixels_per_css_pixel();
DevicePixelConverter device_pixel_converter { device_pixels_per_css_pixel };
VERIFY(!m_surfaces.is_empty());
VERIFY(m_surface);
auto for_each_node_from_common_ancestor_to_target = [](this auto const& self, RefPtr<AccumulatedVisualContext const> common_ancestor, RefPtr<AccumulatedVisualContext const> node, auto&& callback) -> void {
if (!node || node == common_ancestor)
@ -263,8 +260,7 @@ void DisplayListPlayer::execute_impl(DisplayList& display_list, ScrollStateSnaps
applied_depth--;
}
if (surface)
flush();
flush();
}
}

6
Libraries/LibWeb/Painting/DisplayList.h
View file

@ -27,8 +27,8 @@ public:
void execute(DisplayList&, ScrollStateSnapshotByDisplayList&&, RefPtr<Gfx::PaintingSurface>);
protected:
Gfx::PaintingSurface& surface() const { return m_surfaces.last(); }
void execute_impl(DisplayList&, ScrollStateSnapshot const& scroll_state, RefPtr<Gfx::PaintingSurface>);
Gfx::PaintingSurface& surface() const { return *m_surface; }
void execute_impl(DisplayList&, ScrollStateSnapshot const& scroll_state);
ScrollStateSnapshotByDisplayList m_scroll_state_snapshots_by_display_list;
@ -67,7 +67,7 @@ private:
virtual void add_clip_path(Gfx::Path const&) = 0;
Vector<NonnullRefPtr<Gfx::PaintingSurface>, 1> m_surfaces;
RefPtr<Gfx::PaintingSurface> m_surface;
};
class DisplayList : public AtomicRefCounted<DisplayList> {

2
Libraries/LibWeb/Painting/DisplayListPlayerSkia.cpp
View file

@ -752,7 +752,7 @@ void DisplayListPlayerSkia::paint_nested_display_list(PaintNestedDisplayList con
auto& canvas = surface().canvas();
canvas.translate(command.rect.x(), command.rect.y());
ScrollStateSnapshot scroll_state_snapshot = m_scroll_state_snapshots_by_display_list.get(*command.display_list).value_or({});
execute_impl(*command.display_list, scroll_state_snapshot, {});
execute_impl(*command.display_list, scroll_state_snapshot);
}
void DisplayListPlayerSkia::paint_scrollbar(PaintScrollBar const& command)