diff options
author | Andreas Kling <kling@serenityos.org> | 2022-03-10 14:02:25 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-03-11 00:21:49 +0100 |
commit | 02b316fd5cc2039a30cab33edee4595900cb35aa (patch) | |
tree | 22c7ac3c6c93d97fd7548a2b1286516260545a05 /Userland/Libraries/LibWeb/Layout/FrameBox.cpp | |
parent | f6497b64ac52674e99564d83c4fad6229d06b1ef (diff) | |
download | serenity-02b316fd5cc2039a30cab33edee4595900cb35aa.zip |
LibWeb: Let Paintable perform the painting
This patch adds a bunch of Paintable subclasses, each corresponding to
the Layout::Node subclasses that had a paint() override. All painting
logic is moved from layout nodes into their corresponding paintables.
Paintables are now created by asking a Layout::Box to produce one:
static NonnullOwnPtr<Paintable> Layout::Box::create_paintable()
Note that inline nodes still have their painting logic. Since they
are not boxes, and all paintables have a corresponding box, we'll need
to come up with some other solution for them.
Diffstat (limited to 'Userland/Libraries/LibWeb/Layout/FrameBox.cpp')
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/FrameBox.cpp | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp index 55184564bf..538236fb2e 100644 --- a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp @@ -10,7 +10,7 @@ #include <LibWeb/HTML/BrowsingContext.h> #include <LibWeb/Layout/FrameBox.h> #include <LibWeb/Layout/InitialContainingBlock.h> -#include <LibWeb/Painting/Paintable.h> +#include <LibWeb/Painting/NestedBrowsingContextPaintable.h> namespace Web::Layout { @@ -32,38 +32,6 @@ void FrameBox::prepare_for_replaced_layout() set_intrinsic_height(dom_node().attribute(HTML::AttributeNames::height).to_int().value_or(150)); } -void FrameBox::paint(PaintContext& context, Painting::PaintPhase phase) -{ - ReplacedBox::paint(context, phase); - - if (phase == Painting::PaintPhase::Foreground) { - auto* hosted_document = dom_node().content_document_without_origin_check(); - if (!hosted_document) - return; - auto* hosted_layout_tree = hosted_document->layout_node(); - if (!hosted_layout_tree) - return; - - context.painter().save(); - auto old_viewport_rect = context.viewport_rect(); - - context.painter().add_clip_rect(enclosing_int_rect(m_paint_box->absolute_rect())); - context.painter().translate(m_paint_box->absolute_x(), m_paint_box->absolute_y()); - - context.set_viewport_rect({ {}, dom_node().nested_browsing_context()->size() }); - const_cast<Layout::InitialContainingBlock*>(hosted_layout_tree)->paint_all_phases(context); - - context.set_viewport_rect(old_viewport_rect); - context.painter().restore(); - - if constexpr (HIGHLIGHT_FOCUSED_FRAME_DEBUG) { - if (dom_node().nested_browsing_context()->is_focused_context()) { - context.painter().draw_rect(m_paint_box->absolute_rect().to_type<int>(), Color::Cyan); - } - } - } -} - void FrameBox::did_set_rect() { ReplacedBox::did_set_rect(); @@ -72,4 +40,9 @@ void FrameBox::did_set_rect() dom_node().nested_browsing_context()->set_size(m_paint_box->content_size().to_type<int>()); } +OwnPtr<Painting::Paintable> FrameBox::create_paintable() const +{ + return Painting::NestedBrowsingContextPaintable::create(*this); +} + } |