mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-27 04:37:22 +00:00
LibWeb: Implement SVGViewElement
This identifies a particular region of an SVG image, which can then be linked to by an SVG fragment identifier.
This commit is contained in:
parent
81fc8ab8cc
commit
a990de65e4
Notes:
github-actions[bot]
2025-07-21 22:53:34 +00:00
Author: https://github.com/tcl3
Commit: a990de65e4
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5418
Reviewed-by: https://github.com/konradekk
15 changed files with 211 additions and 16 deletions
|
@ -872,6 +872,7 @@ set(SOURCES
|
|||
SVG/SVGTransformList.cpp
|
||||
SVG/SVGTSpanElement.cpp
|
||||
SVG/SVGUseElement.cpp
|
||||
SVG/SVGViewElement.cpp
|
||||
SVG/TagNames.cpp
|
||||
SVG/ViewBox.cpp
|
||||
UIEvents/CompositionEvent.cpp
|
||||
|
|
|
@ -117,6 +117,7 @@
|
|||
#include <LibWeb/SVG/SVGTextPathElement.h>
|
||||
#include <LibWeb/SVG/SVGTitleElement.h>
|
||||
#include <LibWeb/SVG/SVGUseElement.h>
|
||||
#include <LibWeb/SVG/SVGViewElement.h>
|
||||
#include <LibWeb/SVG/TagNames.h>
|
||||
#include <LibWeb/WebIDL/AbstractOperations.h>
|
||||
|
||||
|
@ -512,6 +513,8 @@ static GC::Ref<SVG::SVGElement> create_svg_element(JS::Realm& realm, Document& d
|
|||
return realm.create<SVG::SVGUseElement>(document, move(qualified_name));
|
||||
if (local_name == SVG::TagNames::script)
|
||||
return realm.create<SVG::SVGScriptElement>(document, move(qualified_name));
|
||||
if (local_name == SVG::TagNames::view)
|
||||
return realm.create<SVG::SVGViewElement>(document, move(qualified_name));
|
||||
if (local_name == SVG::TagNames::a)
|
||||
return realm.create<SVG::SVGAElement>(document, move(qualified_name));
|
||||
if (local_name == SVG::TagNames::image)
|
||||
|
|
|
@ -171,6 +171,7 @@ public:
|
|||
virtual bool is_svg_style_element() const { return false; }
|
||||
virtual bool is_svg_svg_element() const { return false; }
|
||||
virtual bool is_svg_use_element() const { return false; }
|
||||
virtual bool is_svg_view_element() const { return false; }
|
||||
virtual bool is_svg_a_element() const { return false; }
|
||||
virtual bool is_svg_foreign_object_element() const { return false; }
|
||||
|
||||
|
|
|
@ -984,6 +984,7 @@ class SVGAnimatedLength;
|
|||
class SVGAnimatedRect;
|
||||
class SVGCircleElement;
|
||||
class SVGClipPathElement;
|
||||
class SVGDecodedImageData;
|
||||
class SVGDefsElement;
|
||||
class SVGDescElement;
|
||||
class SVGElement;
|
||||
|
@ -1007,6 +1008,7 @@ class SVGRectElement;
|
|||
class SVGScriptElement;
|
||||
class SVGSVGElement;
|
||||
class SVGTitleElement;
|
||||
class SVGViewElement;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <LibWeb/SVG/AttributeNames.h>
|
||||
#include <LibWeb/SVG/SVGAnimatedRect.h>
|
||||
#include <LibWeb/SVG/SVGSVGElement.h>
|
||||
#include <LibWeb/SVG/SVGViewElement.h>
|
||||
#include <LibWeb/Selection/Selection.h>
|
||||
|
||||
namespace Web::SVG {
|
||||
|
@ -39,6 +40,7 @@ void SVGSVGElement::initialize(JS::Realm& realm)
|
|||
void SVGSVGElement::visit_edges(Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_active_view_element);
|
||||
visitor.visit(m_view_box_for_bindings);
|
||||
}
|
||||
|
||||
|
@ -137,6 +139,21 @@ void SVGSVGElement::attribute_changed(FlyString const& name, Optional<String> co
|
|||
update_fallback_view_box_for_svg_as_image();
|
||||
}
|
||||
|
||||
void SVGSVGElement::children_changed(ChildrenChangedMetadata const*)
|
||||
{
|
||||
// FIXME: Add support for all types of SVG fragment identifier.
|
||||
// See: https://svgwg.org/svg2-draft/linking.html#LinksIntoSVG
|
||||
if (auto url = document().url(); url.fragment().has_value()) {
|
||||
if (auto referenced_element = get_element_by_id(*url.fragment())) {
|
||||
if (auto* view_element = as_if<SVGViewElement>(*referenced_element)) {
|
||||
set_active_view_element(*view_element);
|
||||
return;
|
||||
}
|
||||
}
|
||||
set_active_view_element({});
|
||||
}
|
||||
}
|
||||
|
||||
void SVGSVGElement::update_fallback_view_box_for_svg_as_image()
|
||||
{
|
||||
// AD-HOC: This creates a fallback viewBox for SVGs used as images.
|
||||
|
@ -173,6 +190,9 @@ void SVGSVGElement::set_fallback_view_box_for_svg_as_image(Optional<ViewBox> vie
|
|||
|
||||
Optional<ViewBox> SVGSVGElement::view_box() const
|
||||
{
|
||||
if (m_active_view_element && m_active_view_element->view_box().has_value())
|
||||
return m_active_view_element->view_box().value();
|
||||
|
||||
if (m_view_box.has_value())
|
||||
return m_view_box;
|
||||
|
||||
|
@ -309,9 +329,18 @@ SVGSVGElement::NaturalMetrics SVGSVGElement::negotiate_natural_metrics(SVG::SVGS
|
|||
return {};
|
||||
}
|
||||
|
||||
// FIXME: 2. If an SVG View is active:
|
||||
// FIXME: 1. let viewbox be the viewbox defined by the active SVG View
|
||||
// FIXME: 2. return viewbox.width / viewbox.height
|
||||
// 2. If an SVG View is active:
|
||||
if (auto active_view_element = svg_root.active_view_element(); active_view_element && active_view_element->view_box().has_value()) {
|
||||
// 1. let viewbox be the viewbox defined by the active SVG View
|
||||
auto view_box = active_view_element->view_box().value();
|
||||
dbgln("SVG View is active");
|
||||
|
||||
// 2. return viewbox.width / viewbox.height
|
||||
if (view_box.width != 0 || view_box.height != 0)
|
||||
return view_box.width / view_box.height;
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
// 3. If the ‘viewBox’ on the ‘svg’ element is correctly specified:
|
||||
if (svg_root.view_box().has_value()) {
|
||||
|
|
|
@ -35,6 +35,9 @@ public:
|
|||
virtual bool is_svg_container() const override { return true; }
|
||||
|
||||
virtual Optional<ViewBox> view_box() const override;
|
||||
|
||||
void set_active_view_element(GC::Ptr<SVGViewElement> view_element) { m_active_view_element = view_element; }
|
||||
|
||||
virtual Optional<PreserveAspectRatio> preserve_aspect_ratio() const override { return m_preserve_aspect_ratio; }
|
||||
|
||||
void set_fallback_view_box_for_svg_as_image(Optional<ViewBox>);
|
||||
|
@ -97,7 +100,10 @@ private:
|
|||
|
||||
virtual bool is_svg_svg_element() const override { return true; }
|
||||
|
||||
GC::Ptr<SVGViewElement> active_view_element() const { return m_active_view_element; }
|
||||
|
||||
virtual void attribute_changed(FlyString const& name, Optional<String> const& old_value, Optional<String> const& value, Optional<FlyString> const& namespace_) override;
|
||||
virtual void children_changed(ChildrenChangedMetadata const*) override;
|
||||
|
||||
void update_fallback_view_box_for_svg_as_image();
|
||||
|
||||
|
@ -107,6 +113,8 @@ private:
|
|||
Optional<ViewBox> m_fallback_view_box_for_svg_as_image;
|
||||
|
||||
GC::Ptr<SVGAnimatedRect> m_view_box_for_bindings;
|
||||
|
||||
GC::Ptr<SVGViewElement> m_active_view_element;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
72
Libraries/LibWeb/SVG/SVGViewElement.cpp
Normal file
72
Libraries/LibWeb/SVG/SVGViewElement.cpp
Normal file
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* Copyright (c) 2025, Tim Ledbetter <tim.ledbetter@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "SVGViewElement.h"
|
||||
#include <LibWeb/Bindings/SVGViewElementPrototype.h>
|
||||
#include <LibWeb/CSS/Parser/Parser.h>
|
||||
#include <LibWeb/DOM/Document.h>
|
||||
#include <LibWeb/SVG/AttributeNames.h>
|
||||
#include <LibWeb/SVG/SVGAnimatedRect.h>
|
||||
|
||||
namespace Web::SVG {
|
||||
|
||||
GC_DEFINE_ALLOCATOR(SVGViewElement);
|
||||
|
||||
SVGViewElement::SVGViewElement(DOM::Document& document, DOM::QualifiedName qualified_name)
|
||||
: SVGGraphicsElement(document, move(qualified_name))
|
||||
{
|
||||
}
|
||||
|
||||
void SVGViewElement::initialize(JS::Realm& realm)
|
||||
{
|
||||
WEB_SET_PROTOTYPE_FOR_INTERFACE(SVGViewElement);
|
||||
Base::initialize(realm);
|
||||
m_view_box_for_bindings = realm.create<SVGAnimatedRect>(realm);
|
||||
}
|
||||
|
||||
void SVGViewElement::visit_edges(Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_view_box_for_bindings);
|
||||
}
|
||||
|
||||
bool SVGViewElement::is_presentational_hint(FlyString const& name) const
|
||||
{
|
||||
if (Base::is_presentational_hint(name))
|
||||
return true;
|
||||
|
||||
return first_is_one_of(name,
|
||||
SVG::AttributeNames::viewBox,
|
||||
SVG::AttributeNames::preserveAspectRatio);
|
||||
}
|
||||
|
||||
void SVGViewElement::apply_presentational_hints(GC::Ref<CSS::CascadedProperties> cascaded_properties) const
|
||||
{
|
||||
Base::apply_presentational_hints(cascaded_properties);
|
||||
auto parsing_context = CSS::Parser::ParsingParams { document(), CSS::Parser::ParsingMode::SVGPresentationAttribute };
|
||||
}
|
||||
|
||||
void SVGViewElement::attribute_changed(FlyString const& name, Optional<String> const& old_value, Optional<String> const& value, Optional<FlyString> const& namespace_)
|
||||
{
|
||||
Base::attribute_changed(name, old_value, value, namespace_);
|
||||
|
||||
if (name.equals_ignoring_ascii_case(SVG::AttributeNames::viewBox)) {
|
||||
if (!value.has_value()) {
|
||||
m_view_box_for_bindings->set_nulled(true);
|
||||
} else {
|
||||
m_view_box = try_parse_view_box(value.value_or(String {}));
|
||||
m_view_box_for_bindings->set_nulled(!m_view_box.has_value());
|
||||
if (m_view_box.has_value()) {
|
||||
m_view_box_for_bindings->set_base_val(Gfx::DoubleRect { m_view_box->min_x, m_view_box->min_y, m_view_box->width, m_view_box->height });
|
||||
m_view_box_for_bindings->set_anim_val(Gfx::DoubleRect { m_view_box->min_x, m_view_box->min_y, m_view_box->width, m_view_box->height });
|
||||
}
|
||||
}
|
||||
}
|
||||
if (name.equals_ignoring_ascii_case(SVG::AttributeNames::preserveAspectRatio))
|
||||
m_preserve_aspect_ratio = AttributeParser::parse_preserve_aspect_ratio(value.value_or(String {}));
|
||||
}
|
||||
|
||||
}
|
51
Libraries/LibWeb/SVG/SVGViewElement.h
Normal file
51
Libraries/LibWeb/SVG/SVGViewElement.h
Normal file
|
@ -0,0 +1,51 @@
|
|||
/*
|
||||
* Copyright (c) 2025, Tim Ledbetter <tim.ledbetter@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibWeb/SVG/SVGGraphicsElement.h>
|
||||
#include <LibWeb/SVG/SVGViewport.h>
|
||||
#include <LibWeb/SVG/ViewBox.h>
|
||||
|
||||
namespace Web::SVG {
|
||||
|
||||
class SVGViewElement final : public SVGGraphicsElement
|
||||
, public SVGViewport {
|
||||
WEB_PLATFORM_OBJECT(SVGViewElement, SVGGraphicsElement);
|
||||
GC_DECLARE_ALLOCATOR(SVGViewElement);
|
||||
|
||||
public:
|
||||
virtual bool is_presentational_hint(FlyString const&) const override;
|
||||
virtual void apply_presentational_hints(GC::Ref<CSS::CascadedProperties>) const override;
|
||||
|
||||
virtual Optional<ViewBox> view_box() const override { return m_view_box; }
|
||||
virtual Optional<PreserveAspectRatio> preserve_aspect_ratio() const override { return m_preserve_aspect_ratio; }
|
||||
|
||||
GC::Ref<SVGAnimatedRect> view_box_for_bindings() { return *m_view_box_for_bindings; }
|
||||
|
||||
private:
|
||||
SVGViewElement(DOM::Document&, DOM::QualifiedName);
|
||||
|
||||
virtual void initialize(JS::Realm&) override;
|
||||
virtual void visit_edges(Visitor&) override;
|
||||
|
||||
virtual bool is_svg_view_element() const override { return true; }
|
||||
|
||||
virtual void attribute_changed(FlyString const& name, Optional<String> const& old_value, Optional<String> const& value, Optional<FlyString> const& namespace_) override;
|
||||
|
||||
Optional<ViewBox> m_view_box;
|
||||
Optional<PreserveAspectRatio> m_preserve_aspect_ratio;
|
||||
GC::Ptr<SVGAnimatedRect> m_view_box_for_bindings;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace Web::DOM {
|
||||
|
||||
template<>
|
||||
inline bool Node::fast_is<SVG::SVGViewElement>() const { return is_svg_view_element(); }
|
||||
|
||||
}
|
8
Libraries/LibWeb/SVG/SVGViewElement.idl
Normal file
8
Libraries/LibWeb/SVG/SVGViewElement.idl
Normal file
|
@ -0,0 +1,8 @@
|
|||
#import <SVG/SVGGraphicsElement.idl>
|
||||
#import <SVG/SVGFitToViewBox.idl>
|
||||
|
||||
// https://svgwg.org/svg2-draft/linking.html#InterfaceSVGViewElement
|
||||
[Exposed=Window]
|
||||
interface SVGViewElement : SVGElement {};
|
||||
|
||||
SVGViewElement includes SVGFitToViewBox;
|
|
@ -42,7 +42,8 @@ namespace Web::SVG::TagNames {
|
|||
__ENUMERATE_SVG_TAG(textPath) \
|
||||
__ENUMERATE_SVG_TAG(title) \
|
||||
__ENUMERATE_SVG_TAG(tspan) \
|
||||
__ENUMERATE_SVG_TAG(use)
|
||||
__ENUMERATE_SVG_TAG(use) \
|
||||
__ENUMERATE_SVG_TAG(view)
|
||||
|
||||
#define __ENUMERATE_SVG_TAG(name) extern FlyString name;
|
||||
ENUMERATE_SVG_TAGS
|
||||
|
|
|
@ -370,6 +370,7 @@ libweb_js_bindings(SVG/SVGTransform)
|
|||
libweb_js_bindings(SVG/SVGTransformList)
|
||||
libweb_js_bindings(SVG/SVGTSpanElement)
|
||||
libweb_js_bindings(SVG/SVGUseElement)
|
||||
libweb_js_bindings(SVG/SVGViewElement)
|
||||
libweb_js_bindings(Selection/Selection)
|
||||
libweb_js_bindings(StorageAPI/StorageManager)
|
||||
libweb_js_bindings(UIEvents/CompositionEvent)
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg">
|
||||
<rect width="100" height="100" fill="green"/>
|
||||
</svg>
|
After Width: | Height: | Size: 96 B |
|
@ -0,0 +1,14 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:h="http://www.w3.org/1999/xhtml">
|
||||
<title><image> referencing SVG image with <view> with 'viewBox'</title>
|
||||
<h:link rel="help" href="https://svgwg.org/svg2-draft/embedded.html#ImageElement"/>
|
||||
<h:link rel="help" href="https://svgwg.org/svg2-draft/linking.html#LinksIntoSVG"/>
|
||||
<h:link rel="match" href="../../../../expected/wpt-import/svg/embedded/reference/green-rect-100x100.svg"/>
|
||||
<rect x="-355" y="-1110" width="455" height="1210" fill="red"/>
|
||||
<image preserveAspectRatio="none" x="-355" y="-1110" width="455" height="1210"
|
||||
xlink:href="data:image/svg+xml,
|
||||
%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2317 2320'%3e
|
||||
%3cview id='view' preserveAspectRatio='none' viewBox='0 0 455 1210'/%3e
|
||||
%3crect width='455' height='1210' fill='green'/%3e
|
||||
%3c/svg%3e#view"/>
|
||||
</svg>
|
After Width: | Height: | Size: 1,004 B |
|
@ -376,6 +376,7 @@ SVGTitleElement
|
|||
SVGTransform
|
||||
SVGTransformList
|
||||
SVGUseElement
|
||||
SVGViewElement
|
||||
Screen
|
||||
ScreenOrientation
|
||||
SecurityPolicyViolationEvent
|
||||
|
|
|
@ -2,8 +2,8 @@ Harness status: OK
|
|||
|
||||
Found 1781 tests
|
||||
|
||||
942 Pass
|
||||
839 Fail
|
||||
952 Pass
|
||||
829 Fail
|
||||
Pass idl_test setup
|
||||
Pass idl_test validation
|
||||
Pass Partial interface Document: original interface defined
|
||||
|
@ -1606,17 +1606,17 @@ Pass SVGElement interface: objects.a must inherit property "ownerSVGElement" wit
|
|||
Pass SVGElement interface: objects.a must inherit property "viewportElement" with the proper type
|
||||
Fail SVGElement interface: objects.a must inherit property "correspondingElement" with the proper type
|
||||
Fail SVGElement interface: objects.a must inherit property "correspondingUseElement" with the proper type
|
||||
Fail SVGViewElement interface: existence and properties of interface object
|
||||
Fail SVGViewElement interface object length
|
||||
Fail SVGViewElement interface object name
|
||||
Fail SVGViewElement interface: existence and properties of interface prototype object
|
||||
Fail SVGViewElement interface: existence and properties of interface prototype object's "constructor" property
|
||||
Fail SVGViewElement interface: existence and properties of interface prototype object's @@unscopables property
|
||||
Fail SVGViewElement interface: attribute viewBox
|
||||
Pass SVGViewElement interface: existence and properties of interface object
|
||||
Pass SVGViewElement interface object length
|
||||
Pass SVGViewElement interface object name
|
||||
Pass SVGViewElement interface: existence and properties of interface prototype object
|
||||
Pass SVGViewElement interface: existence and properties of interface prototype object's "constructor" property
|
||||
Pass SVGViewElement interface: existence and properties of interface prototype object's @@unscopables property
|
||||
Pass SVGViewElement interface: attribute viewBox
|
||||
Fail SVGViewElement interface: attribute preserveAspectRatio
|
||||
Fail SVGViewElement must be primary interface of objects.view
|
||||
Fail Stringification of objects.view
|
||||
Fail SVGViewElement interface: objects.view must inherit property "viewBox" with the proper type
|
||||
Pass SVGViewElement must be primary interface of objects.view
|
||||
Pass Stringification of objects.view
|
||||
Pass SVGViewElement interface: objects.view must inherit property "viewBox" with the proper type
|
||||
Fail SVGViewElement interface: objects.view must inherit property "preserveAspectRatio" with the proper type
|
||||
Pass SVGElement interface: objects.view must inherit property "className" with the proper type
|
||||
Pass SVGElement interface: objects.view must inherit property "ownerSVGElement" with the proper type
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue