mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-11-02 06:10:58 +00:00
ea8d0304e9
While introducing clip and scroll frame trees, I made a mistake by assuming that the paintable tree includes boxes from nested navigables. Therefore, this comment in the code was incorrect, and clip/scroll frames were simply not assigned for iframes: // NOTE: We only need to refresh the scroll state for traversables // because they are responsible for tracking the state of all // nested navigables. As a result, anything with "overflow: scroll" is currently not scrollable inside an iframe This change fixes that by ensuring clip and scroll frames are assigned and refreshed for each navigable. To achieve this, I had to modify the display list building process to record a separate display list for each navigable. This is necessary because scroll frame ids are local to a navigable, making it impossible to call `DisplayList::apply_scroll_offsets()` on a display list that contains ids from multiple navigables.
74 lines
2.7 KiB
C++
74 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/Debug.h>
|
|
#include <LibWeb/HTML/NavigableContainer.h>
|
|
#include <LibWeb/Layout/FrameBox.h>
|
|
#include <LibWeb/Layout/Viewport.h>
|
|
#include <LibWeb/Painting/BorderRadiusCornerClipper.h>
|
|
#include <LibWeb/Painting/NestedBrowsingContextPaintable.h>
|
|
#include <LibWeb/Painting/ViewportPaintable.h>
|
|
|
|
namespace Web::Painting {
|
|
|
|
JS_DEFINE_ALLOCATOR(NestedBrowsingContextPaintable);
|
|
|
|
JS::NonnullGCPtr<NestedBrowsingContextPaintable> NestedBrowsingContextPaintable::create(Layout::FrameBox const& layout_box)
|
|
{
|
|
return layout_box.heap().allocate_without_realm<NestedBrowsingContextPaintable>(layout_box);
|
|
}
|
|
|
|
NestedBrowsingContextPaintable::NestedBrowsingContextPaintable(Layout::FrameBox const& layout_box)
|
|
: PaintableBox(layout_box)
|
|
{
|
|
}
|
|
|
|
Layout::FrameBox const& NestedBrowsingContextPaintable::layout_box() const
|
|
{
|
|
return static_cast<Layout::FrameBox const&>(layout_node());
|
|
}
|
|
|
|
void NestedBrowsingContextPaintable::paint(PaintContext& context, PaintPhase phase) const
|
|
{
|
|
if (!is_visible())
|
|
return;
|
|
|
|
PaintableBox::paint(context, phase);
|
|
|
|
if (phase == PaintPhase::Foreground) {
|
|
auto absolute_rect = this->absolute_rect();
|
|
auto clip_rect = context.rounded_device_rect(absolute_rect.translated(enclosing_scroll_frame_offset()));
|
|
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();
|
|
if (!hosted_document)
|
|
return;
|
|
auto const* hosted_paint_tree = hosted_document->paintable();
|
|
if (!hosted_paint_tree)
|
|
return;
|
|
|
|
context.display_list_recorder().save();
|
|
|
|
context.display_list_recorder().add_clip_rect(clip_rect.to_type<int>());
|
|
|
|
HTML::Navigable::PaintConfig paint_config;
|
|
paint_config.paint_overlay = context.should_paint_overlay();
|
|
paint_config.should_show_line_box_borders = context.should_show_line_box_borders();
|
|
paint_config.has_focus = context.has_focus();
|
|
auto display_list = const_cast<DOM::Document*>(hosted_document)->navigable()->record_display_list(paint_config);
|
|
context.display_list_recorder().paint_nested_display_list(display_list, context.enclosing_device_rect(absolute_rect).to_type<int>());
|
|
|
|
context.display_list_recorder().restore();
|
|
|
|
if constexpr (HIGHLIGHT_FOCUSED_FRAME_DEBUG) {
|
|
if (layout_box().dom_node().content_navigable()->is_focused()) {
|
|
context.display_list_recorder().draw_rect(clip_rect.to_type<int>(), Color::Cyan);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|