LibWeb: Add SVG `<line>` element and test case :^)

Base/res/html/misc/svg.html

@@ -56,6 +56,15 @@
     <g transform="translate(400 550) rotate(-30)">
         <ellipse rx="50" ry="20" fill="none" stroke="blue" stroke-width="4" />
     </g>
+
+    <!-- Based on https://svgwg.org/svg2-draft/shapes.html#LineElement -->
+    <g stroke="green">
+        <line x1="10" y1="700" x2="110" y2="600" stroke-width="5" />
+        <line x1="120" y1="700" x2="220" y2="600" stroke-width="10" />
+        <line x1="230" y1="700" x2="330" y2="600" stroke-width="15" />
+        <line x1="340" y1="700" x2="440" y2="600" stroke-width="20" />
+        <line x1="450" y1="700" x2="550" y2="600" stroke-width="25" />
+    </g>
 </svg>
 </body>
 </html>

Userland/Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp

@@ -84,6 +84,7 @@
 #include <LibWeb/Bindings/NodeWrapperFactory.h>
 #include <LibWeb/Bindings/SVGCircleElementWrapper.h>
 #include <LibWeb/Bindings/SVGEllipseElementWrapper.h>
+#include <LibWeb/Bindings/SVGLineElementWrapper.h>
 #include <LibWeb/Bindings/SVGPathElementWrapper.h>
 #include <LibWeb/Bindings/SVGRectElementWrapper.h>
 #include <LibWeb/Bindings/SVGSVGElementWrapper.h>
@@ -161,6 +162,7 @@
 #include <LibWeb/HTML/HTMLVideoElement.h>
 #include <LibWeb/SVG/SVGCircleElement.h>
 #include <LibWeb/SVG/SVGEllipseElement.h>
+#include <LibWeb/SVG/SVGLineElement.h>
 #include <LibWeb/SVG/SVGPathElement.h>
 #include <LibWeb/SVG/SVGRectElement.h>
 #include <LibWeb/SVG/SVGSVGElement.h>
@@ -319,6 +321,8 @@ NodeWrapper* wrap(JS::GlobalObject& global_object, DOM::Node& node)
         return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGCircleElement>(node)));
     if (is<SVG::SVGEllipseElement>(node))
         return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGEllipseElement>(node)));
+    if (is<SVG::SVGLineElement>(node))
+        return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGLineElement>(node)));
     if (is<SVG::SVGPathElement>(node))
         return static_cast<NodeWrapper*>(wrap_impl(global_object, verify_cast<SVG::SVGPathElement>(node)));
     if (is<SVG::SVGRectElement>(node))

Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h

@@ -257,6 +257,8 @@
 #include <LibWeb/Bindings/SVGGeometryElementPrototype.h>
 #include <LibWeb/Bindings/SVGGraphicsElementConstructor.h>
 #include <LibWeb/Bindings/SVGGraphicsElementPrototype.h>
+#include <LibWeb/Bindings/SVGLineElementConstructor.h>
+#include <LibWeb/Bindings/SVGLineElementPrototype.h>
 #include <LibWeb/Bindings/SVGPathElementConstructor.h>
 #include <LibWeb/Bindings/SVGPathElementPrototype.h>
 #include <LibWeb/Bindings/SVGRectElementConstructor.h>
@@ -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)             \

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)

Userland/Libraries/LibWeb/DOM/ElementFactory.cpp

@@ -79,6 +79,7 @@
 #include <LibWeb/SVG/SVGCircleElement.h>
 #include <LibWeb/SVG/SVGEllipseElement.h>
 #include <LibWeb/SVG/SVGGElement.h>
+#include <LibWeb/SVG/SVGLineElement.h>
 #include <LibWeb/SVG/SVGPathElement.h>
 #include <LibWeb/SVG/SVGRectElement.h>
 #include <LibWeb/SVG/SVGSVGElement.h>
@@ -241,6 +242,8 @@ NonnullRefPtr<Element> 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)

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;

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)
 

Userland/Libraries/LibWeb/SVG/SVGLineElement.cpp

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include "SVGLineElement.h"
+#include <LibWeb/SVG/AttributeNames.h>
+#include <LibWeb/SVG/AttributeParser.h>
+
+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();
+}
+
+}

Userland/Libraries/LibWeb/SVG/SVGLineElement.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <LibWeb/SVG/SVGGeometryElement.h>
+
+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<Gfx::Path> m_path;
+
+    Optional<float> m_x1;
+    Optional<float> m_y1;
+    Optional<float> m_x2;
+    Optional<float> m_y2;
+};
+
+}

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;
+};

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)