diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-02-11 12:37:22 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-02-11 21:38:27 +0100 |
commit | 784c3183f734f45672ec7ebc43d285f81a40e1a0 (patch) | |
tree | 6360405e396fa39bbf8a7022edb3af6141d1df57 /Userland/Libraries/LibWeb | |
parent | 326a5a82ebef1146def6e04f1930ef8c054a59bf (diff) | |
download | serenity-784c3183f734f45672ec7ebc43d285f81a40e1a0.zip |
LibWeb: Rename SVGPathBox -> SVGGeometryBox
This fits better since it's now used by all SVGGeometryElements.
Diffstat (limited to 'Userland/Libraries/LibWeb')
-rw-r--r-- | Userland/Libraries/LibWeb/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/Node.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/SVGFormattingContext.cpp | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/SVGGeometryBox.cpp (renamed from Userland/Libraries/LibWeb/Layout/SVGPathBox.cpp) | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Layout/SVGGeometryBox.h (renamed from Userland/Libraries/LibWeb/Layout/SVGPathBox.h) | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/SVG/SVGPathElement.cpp | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 8b5c86c294..8c87504305 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -235,8 +235,8 @@ set(SOURCES Layout/ReplacedBox.cpp Layout/SVGBox.cpp Layout/SVGFormattingContext.cpp + Layout/SVGGeometryBox.cpp Layout/SVGGraphicsBox.cpp - Layout/SVGPathBox.cpp Layout/SVGSVGBox.cpp Layout/TableBox.cpp Layout/TableCellBox.cpp diff --git a/Userland/Libraries/LibWeb/Layout/Node.h b/Userland/Libraries/LibWeb/Layout/Node.h index d574d9048e..d9e5f22c6e 100644 --- a/Userland/Libraries/LibWeb/Layout/Node.h +++ b/Userland/Libraries/LibWeb/Layout/Node.h @@ -103,7 +103,7 @@ public: virtual bool is_text_node() const { return false; } virtual bool is_initial_containing_block_box() const { return false; } virtual bool is_svg_box() const { return false; } - virtual bool is_svg_path_box() const { return false; } + virtual bool is_svg_geometry_box() const { return false; } virtual bool is_label() const { return false; } template<typename T> diff --git a/Userland/Libraries/LibWeb/Layout/SVGFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/SVGFormattingContext.cpp index e70e3b07b4..9f8becb24f 100644 --- a/Userland/Libraries/LibWeb/Layout/SVGFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/SVGFormattingContext.cpp @@ -6,7 +6,7 @@ #include <AK/Format.h> #include <LibWeb/Layout/SVGFormattingContext.h> -#include <LibWeb/Layout/SVGPathBox.h> +#include <LibWeb/Layout/SVGGeometryBox.h> #include <LibWeb/Layout/SVGSVGBox.h> namespace Web::Layout { @@ -29,10 +29,10 @@ void SVGFormattingContext::run(Box& box, LayoutMode) Gfx::FloatRect total_bounding_box; box.for_each_in_subtree_of_type<SVGBox>([&](auto& descendant) { - if (is<SVGPathBox>(descendant)) { - auto& path_box = static_cast<SVGPathBox&>(descendant); - auto& path = path_box.dom_node().get_path(); - path_box.set_content_size(path.bounding_box().size()); + if (is<SVGGeometryBox>(descendant)) { + auto& geometry_box = static_cast<SVGGeometryBox&>(descendant); + auto& path = geometry_box.dom_node().get_path(); + geometry_box.set_content_size(path.bounding_box().size()); total_bounding_box = total_bounding_box.united(path.bounding_box()); } diff --git a/Userland/Libraries/LibWeb/Layout/SVGPathBox.cpp b/Userland/Libraries/LibWeb/Layout/SVGGeometryBox.cpp index f9bc85b6e9..756016361f 100644 --- a/Userland/Libraries/LibWeb/Layout/SVGPathBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/SVGGeometryBox.cpp @@ -6,17 +6,17 @@ #include <LibGfx/AntiAliasingPainter.h> #include <LibGfx/Painter.h> -#include <LibWeb/Layout/SVGPathBox.h> +#include <LibWeb/Layout/SVGGeometryBox.h> #include <LibWeb/SVG/SVGPathElement.h> namespace Web::Layout { -SVGPathBox::SVGPathBox(DOM::Document& document, SVG::SVGGeometryElement& element, NonnullRefPtr<CSS::StyleProperties> properties) +SVGGeometryBox::SVGGeometryBox(DOM::Document& document, SVG::SVGGeometryElement& element, NonnullRefPtr<CSS::StyleProperties> properties) : SVGGraphicsBox(document, element, properties) { } -void SVGPathBox::paint(PaintContext& context, PaintPhase phase) +void SVGGeometryBox::paint(PaintContext& context, PaintPhase phase) { if (!is_visible()) return; diff --git a/Userland/Libraries/LibWeb/Layout/SVGPathBox.h b/Userland/Libraries/LibWeb/Layout/SVGGeometryBox.h index 624826d9e0..197750d1b5 100644 --- a/Userland/Libraries/LibWeb/Layout/SVGPathBox.h +++ b/Userland/Libraries/LibWeb/Layout/SVGGeometryBox.h @@ -11,10 +11,10 @@ namespace Web::Layout { -class SVGPathBox final : public SVGGraphicsBox { +class SVGGeometryBox final : public SVGGraphicsBox { public: - SVGPathBox(DOM::Document&, SVG::SVGGeometryElement&, NonnullRefPtr<CSS::StyleProperties>); - virtual ~SVGPathBox() override = default; + SVGGeometryBox(DOM::Document&, SVG::SVGGeometryElement&, NonnullRefPtr<CSS::StyleProperties>); + virtual ~SVGGeometryBox() override = default; SVG::SVGGeometryElement& dom_node() { return verify_cast<SVG::SVGGeometryElement>(SVGGraphicsBox::dom_node()); } SVG::SVGGeometryElement const& dom_node() const { return verify_cast<SVG::SVGGeometryElement>(SVGGraphicsBox::dom_node()); } @@ -22,10 +22,10 @@ public: virtual void paint(PaintContext& context, PaintPhase phase) override; private: - virtual bool is_svg_path_box() const final { return true; } + virtual bool is_svg_geometry_box() const final { return true; } }; template<> -inline bool Node::fast_is<SVGPathBox>() const { return is_svg_path_box(); } +inline bool Node::fast_is<SVGGeometryBox>() const { return is_svg_geometry_box(); } } diff --git a/Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp b/Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp index eed13009a7..38b1ce92d3 100644 --- a/Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp +++ b/Userland/Libraries/LibWeb/SVG/SVGGeometryElement.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include <LibWeb/Layout/SVGPathBox.h> +#include <LibWeb/Layout/SVGGeometryBox.h> #include <LibWeb/SVG/SVGGeometryElement.h> namespace Web::SVG { @@ -16,7 +16,7 @@ SVGGeometryElement::SVGGeometryElement(DOM::Document& document, QualifiedName qu RefPtr<Layout::Node> SVGGeometryElement::create_layout_node(NonnullRefPtr<CSS::StyleProperties> style) { - return adopt_ref(*new Layout::SVGPathBox(document(), *this, move(style))); + return adopt_ref(*new Layout::SVGGeometryBox(document(), *this, move(style))); } } diff --git a/Userland/Libraries/LibWeb/SVG/SVGPathElement.cpp b/Userland/Libraries/LibWeb/SVG/SVGPathElement.cpp index 58b5104dfe..f11852a3a6 100644 --- a/Userland/Libraries/LibWeb/SVG/SVGPathElement.cpp +++ b/Userland/Libraries/LibWeb/SVG/SVGPathElement.cpp @@ -11,7 +11,7 @@ #include <LibGfx/Path.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Event.h> -#include <LibWeb/Layout/SVGPathBox.h> +#include <LibWeb/Layout/SVGGeometryBox.h> #include <LibWeb/SVG/SVGPathElement.h> #include <ctype.h> |