RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:58:13 +00:00
Code Issues Activity Actions

LibHTML: Introduce LayoutBox and LayoutNodeWithStyleAndBoxModelMetrics

Browse source 
To streamline the layout tree and remove irrelevant data from classes
that don't need it, this patch adds two new LayoutNode subclasses.

LayoutNodeWithStyleAndBoxModelMetrics should be inherited by any layout
node that cares about box model metrics (margin, border, and padding.)
LayoutBox should be inherited by any layout node that can have a rect.

This makes LayoutText significantly smaller (from 140 to 40 bytes) and
clarifies a lot of things about the layout tree.

I'm also adding next_sibling() and previous_sibling() overloads to
LayoutBlock that return a LayoutBlock*. This is okay since blocks only
ever have block siblings.

Do also note that the semantics of is<T> slightly change in this patch:
is<T>(nullptr) now returns true, to facilitate allowing to<T>(nullptr).
This commit is contained in:
Andreas Kling 2019-10-15 16:48:38 +02:00
parent f4f5ede10a
commit 4814253589
18 changed files with 219 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Libraries/LibHTML/Dump.cpp
View file

@ -58,35 +58,40 @@ void dump_tree(const LayoutNode& layout_node)
else
tag_name = "???";
dbgprintf("%s {%s} at (%d,%d) size %dx%d",
layout_node.class_name(),
tag_name.characters(),
layout_node.x(),
layout_node.y(),
layout_node.width(),
layout_node.height());
if (!layout_node.is_box()) {
dbgprintf("%s {%s}\n", layout_node.class_name(), tag_name.characters());
} else {
auto& layout_box = to<LayoutBox>(layout_node);
dbgprintf("%s {%s} at (%d,%d) size %dx%d",
layout_box.class_name(),
tag_name.characters(),
layout_box.x(),
layout_box.y(),
layout_box.width(),
layout_box.height());
// Dump the horizontal box properties
dbgprintf(" [%d+%d+%d %d %d+%d+%d]",
layout_node.box_model().margin().left.to_px(),
layout_node.box_model().border().left.to_px(),
layout_node.box_model().padding().left.to_px(),
layout_node.width(),
layout_node.box_model().padding().right.to_px(),
layout_node.box_model().border().right.to_px(),
layout_node.box_model().margin().right.to_px());
// Dump the horizontal box properties
dbgprintf(" [%d+%d+%d %d %d+%d+%d]",
layout_box.box_model().margin().left.to_px(),
layout_box.box_model().border().left.to_px(),
layout_box.box_model().padding().left.to_px(),
layout_box.width(),
layout_box.box_model().padding().right.to_px(),
layout_box.box_model().border().right.to_px(),
layout_box.box_model().margin().right.to_px());
// And the vertical box properties
dbgprintf(" [%d+%d+%d %d %d+%d+%d]",
layout_node.box_model().margin().top.to_px(),
layout_node.box_model().border().top.to_px(),
layout_node.box_model().padding().top.to_px(),
layout_node.height(),
layout_node.box_model().padding().bottom.to_px(),
layout_node.box_model().border().bottom.to_px(),
layout_node.box_model().margin().bottom.to_px());
// And the vertical box properties
dbgprintf(" [%d+%d+%d %d %d+%d+%d]",
layout_box.box_model().margin().top.to_px(),
layout_box.box_model().border().top.to_px(),
layout_box.box_model().padding().top.to_px(),
layout_box.height(),
layout_box.box_model().padding().bottom.to_px(),
layout_box.box_model().border().bottom.to_px(),
layout_box.box_model().margin().bottom.to_px());
dbgprintf("\n");
dbgprintf("\n");
}
if (layout_node.is_block() && static_cast<const LayoutBlock&>(layout_node).children_are_inline()) {
auto& block = static_cast<const LayoutBlock&>(layout_node);