summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2023-05-21 13:25:03 +0200
committerAndreas Kling <kling@serenityos.org>2023-05-21 16:01:19 +0200
commit0f4b82bdea83bd4da64b51faec0e2abc5f8ffc35 (patch)
tree58944e8b0b9f96236f975efcf37e38c030d92e75
parent055dabc1231f5c2529e9c737534eba48de6e9397 (diff)
downloadserenity-0f4b82bdea83bd4da64b51faec0e2abc5f8ffc35.zip
LibWeb: Move SVGElement's dataset construction to initialize()
It's not safe to allocate new cells while in a cell constructor.
-rw-r--r--Userland/Libraries/LibWeb/SVG/SVGElement.cpp8
-rw-r--r--Userland/Libraries/LibWeb/SVG/SVGElement.h2
2 files changed, 7 insertions, 3 deletions
diff --git a/Userland/Libraries/LibWeb/SVG/SVGElement.cpp b/Userland/Libraries/LibWeb/SVG/SVGElement.cpp
index 189a6c7a54..09da38721d 100644
--- a/Userland/Libraries/LibWeb/SVG/SVGElement.cpp
+++ b/Userland/Libraries/LibWeb/SVG/SVGElement.cpp
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
+#include <LibWeb/Bindings/ExceptionOrUtils.h>
#include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/HTML/DOMStringMap.h>
#include <LibWeb/SVG/SVGElement.h>
@@ -12,7 +13,6 @@ namespace Web::SVG {
SVGElement::SVGElement(DOM::Document& document, DOM::QualifiedName qualified_name)
: Element(document, move(qualified_name))
- , m_dataset(HTML::DOMStringMap::create(*this).release_value_but_fixme_should_propagate_errors())
{
}
@@ -21,13 +21,17 @@ JS::ThrowCompletionOr<void> SVGElement::initialize(JS::Realm& realm)
MUST_OR_THROW_OOM(Base::initialize(realm));
set_prototype(&Bindings::ensure_web_prototype<Bindings::SVGElementPrototype>(realm, "SVGElement"));
+ m_dataset = TRY(Bindings::throw_dom_exception_if_needed(realm.vm(), [&]() {
+ return HTML::DOMStringMap::create(*this);
+ }));
+
return {};
}
void SVGElement::visit_edges(Cell::Visitor& visitor)
{
Base::visit_edges(visitor);
- visitor.visit(m_dataset.ptr());
+ visitor.visit(m_dataset);
}
}
diff --git a/Userland/Libraries/LibWeb/SVG/SVGElement.h b/Userland/Libraries/LibWeb/SVG/SVGElement.h
index 7ffff6f812..e3ce0535c2 100644
--- a/Userland/Libraries/LibWeb/SVG/SVGElement.h
+++ b/Userland/Libraries/LibWeb/SVG/SVGElement.h
@@ -25,7 +25,7 @@ protected:
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
virtual void visit_edges(Cell::Visitor&) override;
- JS::NonnullGCPtr<HTML::DOMStringMap> m_dataset;
+ JS::GCPtr<HTML::DOMStringMap> m_dataset;
};
}