From 28dcef47572f656ec81ff79a48c411c807e4086f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 9 Jun 2020 21:08:15 +0200 Subject: [PATCH] LibWeb: Add LayoutTableRowGroup to implement display: table-row-group --- Libraries/LibWeb/CMakeLists.txt | 1 + Libraries/LibWeb/DOM/Element.cpp | 3 + Libraries/LibWeb/Layout/LayoutBlock.h | 8 +-- Libraries/LibWeb/Layout/LayoutNode.h | 1 + .../LibWeb/Layout/LayoutTableRowGroup.cpp | 59 +++++++++++++++++++ Libraries/LibWeb/Layout/LayoutTableRowGroup.h | 51 ++++++++++++++++ 6 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp create mode 100644 Libraries/LibWeb/Layout/LayoutTableRowGroup.h diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index ae553f6d18..6f9a59fe6b 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -87,6 +87,7 @@ set(SOURCES Layout/LayoutTable.cpp Layout/LayoutTableCell.cpp Layout/LayoutTableRow.cpp + Layout/LayoutTableRowGroup.cpp Layout/LayoutText.cpp Layout/LayoutTreeBuilder.cpp Layout/LayoutWidget.cpp diff --git a/Libraries/LibWeb/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp index 19b43175d5..f8c4565ca6 100644 --- a/Libraries/LibWeb/DOM/Element.cpp +++ b/Libraries/LibWeb/DOM/Element.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -130,6 +131,8 @@ RefPtr Element::create_layout_node(const StyleProperties* parent_sty return adopt(*new LayoutTableRow(*this, move(style))); if (display == "table-cell") return adopt(*new LayoutTableCell(*this, move(style))); + if (display == "table-row-group") + return adopt(*new LayoutTableRowGroup(*this, move(style))); if (display == "inline-block") { auto inline_block = adopt(*new LayoutBlock(this, move(style))); inline_block->set_inline(true); diff --git a/Libraries/LibWeb/Layout/LayoutBlock.h b/Libraries/LibWeb/Layout/LayoutBlock.h index 597a3ac9b2..0a1d770c88 100644 --- a/Libraries/LibWeb/Layout/LayoutBlock.h +++ b/Libraries/LibWeb/Layout/LayoutBlock.h @@ -65,6 +65,10 @@ public: virtual void split_into_lines(LayoutBlock& container, LayoutMode) override; +protected: + void compute_width(); + void compute_position(); + void compute_height(); private: virtual bool is_block() const override { return true; } @@ -75,10 +79,6 @@ private: void layout_inline_children(LayoutMode); void layout_block_children(LayoutMode); - void compute_width(); - void compute_position(); - void compute_height(); - Vector m_line_boxes; }; diff --git a/Libraries/LibWeb/Layout/LayoutNode.h b/Libraries/LibWeb/Layout/LayoutNode.h index e34332f9b2..cc9153bd78 100644 --- a/Libraries/LibWeb/Layout/LayoutNode.h +++ b/Libraries/LibWeb/Layout/LayoutNode.h @@ -153,6 +153,7 @@ public: virtual bool is_table() const { return false; } virtual bool is_table_row() const { return false; } virtual bool is_table_cell() const { return false; } + virtual bool is_table_row_group() const { return false; } bool has_style() const { return m_has_style; } bool is_inline() const { return m_inline; } diff --git a/Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp b/Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp new file mode 100644 index 0000000000..de1be0657f --- /dev/null +++ b/Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2020, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +namespace Web { + +LayoutTableRowGroup::LayoutTableRowGroup(const Element& element, NonnullRefPtr style) + : LayoutBlock(&element, move(style)) +{ +} + +LayoutTableRowGroup::~LayoutTableRowGroup() +{ +} + +void LayoutTableRowGroup::layout(LayoutMode layout_mode) +{ + compute_width(); + + if (!is_inline()) + compute_position(); + + float content_height = 0; + + for_each_child_of_type([&](auto& row) { + row.layout(layout_mode); + content_height += row.height(); + }); + + rect().set_height(content_height); +} + +} diff --git a/Libraries/LibWeb/Layout/LayoutTableRowGroup.h b/Libraries/LibWeb/Layout/LayoutTableRowGroup.h new file mode 100644 index 0000000000..f35f4571e7 --- /dev/null +++ b/Libraries/LibWeb/Layout/LayoutTableRowGroup.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include + +namespace Web { + +class LayoutTableRowGroup final : public LayoutBlock { +public: + LayoutTableRowGroup(const Element&, NonnullRefPtr); + virtual ~LayoutTableRowGroup() override; + + virtual void layout(LayoutMode = LayoutMode::Default) override; + +private: + virtual bool is_table_row_group() const override { return true; } + virtual const char* class_name() const override { return "LayoutTableRowGroup"; } +}; + +template<> +inline bool is(const LayoutNode& node) +{ + return node.is_table_row_group(); +} + +}