LibWeb: Delete NavigableContainerViewportPaintable::layout_box()

No need for this method when we could reach into DOM node directly from
Paintable.
This commit is contained in:
Aliaksandr Kalenik 2025-10-10 03:30:16 +02:00 committed by Jelle Raaijmakers
parent c1ff2a845c
commit 5c699e1a45
3 changed files with 5 additions and 9 deletions

View File

@ -2687,7 +2687,7 @@ void Navigable::start_display_list_rendering(Gfx::PaintingSurface& painting_surf
scroll_state_snapshot_by_display_list.set(*display_list, move(scroll_state_snapshot));
// Collect scroll state snapshots for each nested navigable
document_paintable.for_each_in_inclusive_subtree_of_type<Painting::NavigableContainerViewportPaintable>([&scroll_state_snapshot_by_display_list](auto& navigable_container_paintable) {
auto const* hosted_document = navigable_container_paintable.layout_box().dom_node().content_document_without_origin_check();
auto const* hosted_document = navigable_container_paintable.navigable_container().content_document_without_origin_check();
if (!hosted_document || !hosted_document->paintable())
return TraversalDecision::Continue;
// We are only interested in collecting scroll state snapshots for visible nested navigables, which is

View File

@ -28,11 +28,6 @@ NavigableContainerViewportPaintable::NavigableContainerViewportPaintable(Layout:
{
}
Layout::NavigableContainerViewport const& NavigableContainerViewportPaintable::layout_box() const
{
return static_cast<Layout::NavigableContainerViewport const&>(layout_node());
}
void NavigableContainerViewportPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const
{
if (!is_visible())
@ -45,7 +40,8 @@ void NavigableContainerViewportPaintable::paint(DisplayListRecordingContext& con
auto clip_rect = context.rounded_device_rect(absolute_rect);
ScopedCornerRadiusClip corner_clip { context, clip_rect, normalized_border_radii_data(ShrinkRadiiForBorders::Yes) };
auto const* hosted_document = layout_box().dom_node().content_document_without_origin_check();
auto const& navigable_container = this->navigable_container();
auto const* hosted_document = navigable_container.content_document_without_origin_check();
if (!hosted_document)
return;
auto const* hosted_paint_tree = hosted_document->paintable();
@ -65,7 +61,7 @@ void NavigableContainerViewportPaintable::paint(DisplayListRecordingContext& con
context.display_list_recorder().restore();
if constexpr (HIGHLIGHT_FOCUSED_FRAME_DEBUG) {
if (layout_box().dom_node().content_navigable()->is_focused()) {
if (navigable_container.content_navigable()->is_focused()) {
context.display_list_recorder().draw_rect(clip_rect.to_type<int>(), Color::Cyan);
}
}

View File

@ -22,7 +22,7 @@ public:
virtual void paint(DisplayListRecordingContext&, PaintPhase) const override;
Layout::NavigableContainerViewport const& layout_box() const;
auto const& navigable_container() const { return as<HTML::NavigableContainer>(*dom_node()); }
private:
NavigableContainerViewportPaintable(Layout::NavigableContainerViewport const&);