From 17912330c40a6e67869366c9d7ba604348fc860f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Fri, 11 Feb 2022 16:56:36 +0000 Subject: [PATCH] LibWeb: Add SVG `` element and test case :^) --- Base/res/html/misc/svg.html | 9 +++ .../LibWeb/Bindings/NodeWrapperFactory.cpp | 4 ++ .../LibWeb/Bindings/WindowObjectHelper.h | 3 + Userland/Libraries/LibWeb/CMakeLists.txt | 2 + .../Libraries/LibWeb/DOM/ElementFactory.cpp | 3 + Userland/Libraries/LibWeb/Forward.h | 2 + .../Libraries/LibWeb/SVG/AttributeNames.h | 4 ++ .../Libraries/LibWeb/SVG/SVGLineElement.cpp | 58 +++++++++++++++++++ .../Libraries/LibWeb/SVG/SVGLineElement.h | 33 +++++++++++ .../Libraries/LibWeb/SVG/SVGLineElement.idl | 7 +++ Userland/Libraries/LibWeb/SVG/TagNames.h | 1 + 11 files changed, 126 insertions(+) create mode 100644 Userland/Libraries/LibWeb/SVG/SVGLineElement.cpp create mode 100644 Userland/Libraries/LibWeb/SVG/SVGLineElement.h create mode 100644 Userland/Libraries/LibWeb/SVG/SVGLineElement.idl diff --git a/Base/res/html/misc/svg.html b/Base/res/html/misc/svg.html index e49d24d56ac..0b23741b9e2 100644 --- a/Base/res/html/misc/svg.html +++ b/Base/res/html/misc/svg.html @@ -56,6 +56,15 @@ + + + + + + + + + diff --git a/Userland/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp b/Userland/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp index 6e37cc5d371..e921dc19f06 100644 --- a/Userland/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp +++ b/Userland/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp @@ -84,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -161,6 +162,7 @@ #include #include #include +#include #include #include #include @@ -319,6 +321,8 @@ NodeWrapper* wrap(JS::GlobalObject& global_object, DOM::Node& node) return static_cast(wrap_impl(global_object, verify_cast(node))); if (is(node)) return static_cast(wrap_impl(global_object, verify_cast(node))); + if (is(node)) + return static_cast(wrap_impl(global_object, verify_cast(node))); if (is(node)) return static_cast(wrap_impl(global_object, verify_cast(node))); if (is(node)) diff --git a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h b/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h index 88da06aea90..54a9c5dbb32 100644 --- a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h +++ b/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h @@ -257,6 +257,8 @@ #include #include #include +#include +#include #include #include #include @@ -442,6 +444,7 @@ ADD_WINDOW_OBJECT_INTERFACE(SVGEllipseElement) \ ADD_WINDOW_OBJECT_INTERFACE(SVGGeometryElement) \ ADD_WINDOW_OBJECT_INTERFACE(SVGGraphicsElement) \ + ADD_WINDOW_OBJECT_INTERFACE(SVGLineElement) \ ADD_WINDOW_OBJECT_INTERFACE(SVGPathElement) \ ADD_WINDOW_OBJECT_INTERFACE(SVGRectElement) \ ADD_WINDOW_OBJECT_INTERFACE(SVGSVGElement) \ diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 36654b378f8..3498756ca43 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -273,6 +273,7 @@ set(SOURCES SVG/SVGPathElement.cpp SVG/SVGCircleElement.cpp SVG/SVGEllipseElement.cpp + SVG/SVGLineElement.cpp SVG/SVGRectElement.cpp SVG/SVGSVGElement.cpp SVG/TagNames.cpp @@ -517,6 +518,7 @@ libweb_js_wrapper(SVG/SVGGeometryElement) libweb_js_wrapper(SVG/SVGGraphicsElement) libweb_js_wrapper(SVG/SVGCircleElement) libweb_js_wrapper(SVG/SVGEllipseElement) +libweb_js_wrapper(SVG/SVGLineElement) libweb_js_wrapper(SVG/SVGPathElement) libweb_js_wrapper(SVG/SVGRectElement) libweb_js_wrapper(SVG/SVGSVGElement) diff --git a/Userland/Libraries/LibWeb/DOM/ElementFactory.cpp b/Userland/Libraries/LibWeb/DOM/ElementFactory.cpp index 54b562e54e9..bc1a6f26ccb 100644 --- a/Userland/Libraries/LibWeb/DOM/ElementFactory.cpp +++ b/Userland/Libraries/LibWeb/DOM/ElementFactory.cpp @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -241,6 +242,8 @@ NonnullRefPtr create_element(Document& document, const FlyString& tag_n return adopt_ref(*new SVG::SVGCircleElement(document, move(qualified_name))); if (lowercase_tag_name == SVG::TagNames::ellipse) return adopt_ref(*new SVG::SVGEllipseElement(document, move(qualified_name))); + if (lowercase_tag_name == SVG::TagNames::line) + return adopt_ref(*new SVG::SVGLineElement(document, move(qualified_name))); if (lowercase_tag_name == SVG::TagNames::path) return adopt_ref(*new SVG::SVGPathElement(document, move(qualified_name))); if (lowercase_tag_name == SVG::TagNames::rect) diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index cee4b495e7f..0a4b3b1e4b2 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -249,6 +249,7 @@ class SVGElement; class SVGEllipseElement; class SVGGeometryElement; class SVGGraphicsElement; +class SVGLineElement; class SVGPathElement; class SVGRectElement; class SVGSVGElement; @@ -457,6 +458,7 @@ class SVGElementWrapper; class SVGEllipseElementWrapper; class SVGGeometryElementWrapper; class SVGGraphicsElementWrapper; +class SVGLineElementWrapper; class SVGPathElementWrapper; class SVGRectElementWrapper; class SVGSVGElementWrapper; diff --git a/Userland/Libraries/LibWeb/SVG/AttributeNames.h b/Userland/Libraries/LibWeb/SVG/AttributeNames.h index 4f8ad259d86..22d491d7aa9 100644 --- a/Userland/Libraries/LibWeb/SVG/AttributeNames.h +++ b/Userland/Libraries/LibWeb/SVG/AttributeNames.h @@ -77,8 +77,12 @@ namespace Web::SVG::AttributeNames { E(viewTarget) \ E(width) \ E(x) \ + E(x1) \ + E(x2) \ E(xChannelSelector) \ E(y) \ + E(y1) \ + E(y2) \ E(yChannelSelector) \ E(zoomAndPan) diff --git a/Userland/Libraries/LibWeb/SVG/SVGLineElement.cpp b/Userland/Libraries/LibWeb/SVG/SVGLineElement.cpp new file mode 100644 index 00000000000..b79083ba036 --- /dev/null +++ b/Userland/Libraries/LibWeb/SVG/SVGLineElement.cpp @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2022, Sam Atkins + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include "SVGLineElement.h" +#include +#include + +namespace Web::SVG { + +SVGLineElement::SVGLineElement(DOM::Document& document, QualifiedName qualified_name) + : SVGGeometryElement(document, qualified_name) +{ +} + +void SVGLineElement::parse_attribute(FlyString const& name, String const& value) +{ + SVGGeometryElement::parse_attribute(name, value); + + if (name == SVG::AttributeNames::x1) { + m_x1 = AttributeParser::parse_coordinate(value); + m_path.clear(); + } else if (name == SVG::AttributeNames::y1) { + m_y1 = AttributeParser::parse_coordinate(value); + m_path.clear(); + } else if (name == SVG::AttributeNames::x2) { + m_x2 = AttributeParser::parse_coordinate(value); + m_path.clear(); + } else if (name == SVG::AttributeNames::y2) { + m_y2 = AttributeParser::parse_coordinate(value); + m_path.clear(); + } +} + +Gfx::Path& SVGLineElement::get_path() +{ + if (m_path.has_value()) + return m_path.value(); + + Gfx::Path path; + float x1 = m_x1.value_or(0); + float y1 = m_y1.value_or(0); + float x2 = m_x2.value_or(0); + float y2 = m_y2.value_or(0); + + // 1. perform an absolute moveto operation to absolute location (x1,y1) + path.move_to({ x1, y1 }); + + // 2. perform an absolute lineto operation to absolute location (x2,y2) + path.line_to({ x2, y2 }); + + m_path = move(path); + return m_path.value(); +} + +} diff --git a/Userland/Libraries/LibWeb/SVG/SVGLineElement.h b/Userland/Libraries/LibWeb/SVG/SVGLineElement.h new file mode 100644 index 00000000000..48b90af4803 --- /dev/null +++ b/Userland/Libraries/LibWeb/SVG/SVGLineElement.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022, Sam Atkins + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Web::SVG { + +class SVGLineElement final : public SVGGeometryElement { +public: + using WrapperType = Bindings::SVGLineElementWrapper; + + SVGLineElement(DOM::Document&, QualifiedName); + virtual ~SVGLineElement() override = default; + + virtual void parse_attribute(FlyString const& name, String const& value) override; + + virtual Gfx::Path& get_path() override; + +private: + Optional m_path; + + Optional m_x1; + Optional m_y1; + Optional m_x2; + Optional m_y2; +}; + +} diff --git a/Userland/Libraries/LibWeb/SVG/SVGLineElement.idl b/Userland/Libraries/LibWeb/SVG/SVGLineElement.idl new file mode 100644 index 00000000000..97a8bd6171c --- /dev/null +++ b/Userland/Libraries/LibWeb/SVG/SVGLineElement.idl @@ -0,0 +1,7 @@ +[Exposed=Window] +interface SVGLineElement : SVGGeometryElement { + // [SameObject] readonly attribute SVGAnimatedLength x1; + // [SameObject] readonly attribute SVGAnimatedLength y1; + // [SameObject] readonly attribute SVGAnimatedLength x2; + // [SameObject] readonly attribute SVGAnimatedLength y2; +}; diff --git a/Userland/Libraries/LibWeb/SVG/TagNames.h b/Userland/Libraries/LibWeb/SVG/TagNames.h index 79ad4406430..9bd914f7482 100644 --- a/Userland/Libraries/LibWeb/SVG/TagNames.h +++ b/Userland/Libraries/LibWeb/SVG/TagNames.h @@ -14,6 +14,7 @@ namespace Web::SVG::TagNames { __ENUMERATE_SVG_TAG(circle) \ __ENUMERATE_SVG_TAG(ellipse) \ __ENUMERATE_SVG_TAG(g) \ + __ENUMERATE_SVG_TAG(line) \ __ENUMERATE_SVG_TAG(path) \ __ENUMERATE_SVG_TAG(rect) \ __ENUMERATE_SVG_TAG(svg)