From fb3294863e360c9aadf4a4e0865806469912abe8 Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Tue, 14 Feb 2023 20:24:29 +0100 Subject: [PATCH] LibWeb: Return JS::NonnullGCPtr instead of StaticRange* --- Userland/Libraries/LibWeb/DOM/StaticRange.cpp | 4 ++-- Userland/Libraries/LibWeb/DOM/StaticRange.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibWeb/DOM/StaticRange.cpp b/Userland/Libraries/LibWeb/DOM/StaticRange.cpp index c941f2a1ae..b2733fb629 100644 --- a/Userland/Libraries/LibWeb/DOM/StaticRange.cpp +++ b/Userland/Libraries/LibWeb/DOM/StaticRange.cpp @@ -22,7 +22,7 @@ StaticRange::StaticRange(Node& start_container, u32 start_offset, Node& end_cont StaticRange::~StaticRange() = default; // https://dom.spec.whatwg.org/#dom-staticrange-staticrange -WebIDL::ExceptionOr StaticRange::construct_impl(JS::Realm& realm, StaticRangeInit& init) +WebIDL::ExceptionOr> StaticRange::construct_impl(JS::Realm& realm, StaticRangeInit& init) { // 1. If init["startContainer"] or init["endContainer"] is a DocumentType or Attr node, then throw an "InvalidNodeTypeError" DOMException. if (is(*init.start_container) || is(*init.start_container)) @@ -32,7 +32,7 @@ WebIDL::ExceptionOr StaticRange::construct_impl(JS::Realm& realm, return WebIDL::InvalidNodeTypeError::create(realm, "endContainer cannot be a DocumentType or Attribute node."); // 2. Set this’s start to (init["startContainer"], init["startOffset"]) and end to (init["endContainer"], init["endOffset"]). - return MUST_OR_THROW_OOM(realm.heap().allocate(realm, *init.start_container, init.start_offset, *init.end_container, init.end_offset)).ptr(); + return MUST_OR_THROW_OOM(realm.heap().allocate(realm, *init.start_container, init.start_offset, *init.end_container, init.end_offset)); } JS::ThrowCompletionOr StaticRange::initialize(JS::Realm& realm) diff --git a/Userland/Libraries/LibWeb/DOM/StaticRange.h b/Userland/Libraries/LibWeb/DOM/StaticRange.h index 60a06597d2..3f306be75b 100644 --- a/Userland/Libraries/LibWeb/DOM/StaticRange.h +++ b/Userland/Libraries/LibWeb/DOM/StaticRange.h @@ -24,7 +24,7 @@ class StaticRange final : public AbstractRange { WEB_PLATFORM_OBJECT(StaticRange, AbstractRange); public: - static WebIDL::ExceptionOr construct_impl(JS::Realm&, StaticRangeInit& init); + static WebIDL::ExceptionOr> construct_impl(JS::Realm&, StaticRangeInit& init); StaticRange(Node& start_container, u32 start_offset, Node& end_container, u32 end_offset); virtual ~StaticRange() override;