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/FormattingState.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/FormattingState.cpp')
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/FormattingState.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/FormattingState.cpp b/Userland/Libraries/LibWeb/Layout/FormattingState.cpp index 913456f19f..d5078ef030 100644 --- a/Userland/Libraries/LibWeb/Layout/FormattingState.cpp +++ b/Userland/Libraries/LibWeb/Layout/FormattingState.cpp @@ -41,11 +41,7 @@ void FormattingState::commit() // For boxes, transfer all the state needed for painting. if (is<Layout::Box>(node)) { auto& box = static_cast<Layout::Box&>(node); - box.set_paint_box([](Layout::Box const& layout_box) -> OwnPtr<Painting::Paintable> { - if (is<Layout::BlockContainer>(layout_box)) - return Painting::PaintableWithLines::create(static_cast<Layout::BlockContainer const&>(layout_box)); - return Painting::Paintable::create(static_cast<Layout::Box const&>(layout_box)); - }(box)); + box.set_paint_box(box.create_paintable()); box.m_paint_box->set_offset(node_state.offset); box.m_paint_box->set_content_size(node_state.content_width, node_state.content_height); box.m_paint_box->set_overflow_data(move(node_state.overflow_data)); |