From 1b7aa00768d2415626782a51ca0adcc2fe710eb1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 6 Oct 2019 11:09:38 +0200 Subject: [PATCH] LibHTML: LayoutText should inherit from LayoutNode directly There's no need for LayoutText to inherit from LayoutInline. I had the wrong idea here: I was thinking that everything that can be laid out inline should inherit from LayoutInline, but that's clearly not sufficient for something like LayoutReplaced which can be laid out in either way. --- Libraries/LibHTML/Layout/LayoutText.cpp | 3 ++- Libraries/LibHTML/Layout/LayoutText.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Libraries/LibHTML/Layout/LayoutText.cpp b/Libraries/LibHTML/Layout/LayoutText.cpp index 43b640f43f..99d6c9e722 100644 --- a/Libraries/LibHTML/Layout/LayoutText.cpp +++ b/Libraries/LibHTML/Layout/LayoutText.cpp @@ -8,8 +8,9 @@ #include LayoutText::LayoutText(const Text& text) - : LayoutInline(text, {}) + : LayoutNode(&text, {}) { + set_inline(true); } LayoutText::~LayoutText() diff --git a/Libraries/LibHTML/Layout/LayoutText.h b/Libraries/LibHTML/Layout/LayoutText.h index 008e60ede6..9a70eb23f8 100644 --- a/Libraries/LibHTML/Layout/LayoutText.h +++ b/Libraries/LibHTML/Layout/LayoutText.h @@ -1,12 +1,12 @@ #pragma once #include -#include +#include class Font; class LineBoxFragment; -class LayoutText : public LayoutInline { +class LayoutText : public LayoutNode { public: explicit LayoutText(const Text&); virtual ~LayoutText() override;