RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:47:47 +00:00
Code Issues Activity Actions

LibHTML: Remove unused LayoutInline::layout()

Browse source 
Inline layout now happens in the containing block, specifically in
LayoutBlock::layout_inline_children().
This commit is contained in:
Andreas Kling 2019-10-03 17:36:06 +02:00
parent f908a2718a
commit d68c1effcb
2 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Libraries/LibHTML/Layout/LayoutInline.cpp
View file

@ -1,4 +1,3 @@
#include <LibHTML/DOM/Element.h>
#include <LibHTML/Layout/LayoutBlock.h> #include <LibHTML/Layout/LayoutBlock.h>
#include <LibHTML/Layout/LayoutInline.h> #include <LibHTML/Layout/LayoutInline.h>
@ -11,32 +10,6 @@ LayoutInline::~LayoutInline()
{ {
} }
void LayoutInline::layout()
{
Point origin;
if (previous_sibling() != nullptr) {
auto& previous_sibling_rect = previous_sibling()->rect();
auto& previous_sibling_style = previous_sibling()->style();
origin = previous_sibling_rect.location();
// FIXME: Implement proper inline positioning when
// there are nodes with different heights. And don't
// hardcode font size like we do here.
origin.move_by(previous_sibling_rect.width(), previous_sibling_rect.height());
origin.move_by(previous_sibling_style.full_margin().right, -11);
} else {
origin = parent()->rect().location();
}
rect().set_location(origin);
for_each_child([&](auto& child) {
child.layout();
rect().set_right(child.rect().right() + child.style().full_margin().right);
rect().set_bottom(child.rect().bottom() + child.style().full_margin().bottom);
});
}
void LayoutInline::split_into_lines(LayoutBlock& container) void LayoutInline::split_into_lines(LayoutBlock& container)
{ {
for_each_child([&](auto& child) { for_each_child([&](auto& child) {

3
Libraries/LibHTML/Layout/LayoutInline.h
View file

@ -2,7 +2,6 @@
#include <LibHTML/Layout/LayoutNode.h> #include <LibHTML/Layout/LayoutNode.h>
class Element;
class LayoutBlock; class LayoutBlock;
class LayoutInline : public LayoutNode { class LayoutInline : public LayoutNode {
@ -13,8 +12,6 @@ public:
virtual const char* class_name() const override { return "LayoutInline"; } virtual const char* class_name() const override { return "LayoutInline"; }
virtual bool is_inline() const override { return true; } virtual bool is_inline() const override { return true; }
virtual void layout() override;
virtual void split_into_lines(LayoutBlock& container); virtual void split_into_lines(LayoutBlock& container);
private: private: