diff --git a/Userland/Libraries/LibWeb/Fetch/Request.cpp b/Userland/Libraries/LibWeb/Fetch/Request.cpp index 7cc571cd2ec..a85ff840fb9 100644 --- a/Userland/Libraries/LibWeb/Fetch/Request.cpp +++ b/Userland/Libraries/LibWeb/Fetch/Request.cpp @@ -182,7 +182,7 @@ WebIDL::ExceptionOr> Request::construct_impl(JS::Realm // method // request’s method. - request->set_method(TRY_OR_THROW_OOM(vm, ByteBuffer::copy(input_request->method()))); + request->set_method(MUST(ByteBuffer::copy(input_request->method()))); // header list // A copy of request’s header list. @@ -373,7 +373,7 @@ WebIDL::ExceptionOr> Request::construct_impl(JS::Realm return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Method must not be one of CONNECT, TRACE, or TRACK"sv }; // 3. Normalize method. - method = TRY_OR_THROW_OOM(vm, String::from_utf8(Infrastructure::normalize_method(method.bytes()))); + method = MUST(String::from_utf8(Infrastructure::normalize_method(method.bytes()))); // 4. Set request’s method to method. request->set_method(MUST(ByteBuffer::copy(method.bytes()))); @@ -503,21 +503,17 @@ WebIDL::ExceptionOr> Request::construct_impl(JS::Realm } // https://fetch.spec.whatwg.org/#dom-request-method -WebIDL::ExceptionOr Request::method() const +String Request::method() const { - auto& vm = this->vm(); - // The method getter steps are to return this’s request’s method. - return TRY_OR_THROW_OOM(vm, String::from_utf8(m_request->method())); + return MUST(String::from_utf8(m_request->method())); } // https://fetch.spec.whatwg.org/#dom-request-url -WebIDL::ExceptionOr Request::url() const +String Request::url() const { - auto& vm = this->vm(); - // The url getter steps are to return this’s request’s URL, serialized. - return TRY_OR_THROW_OOM(vm, String::from_byte_string(m_request->url().serialize())); + return MUST(String::from_byte_string(m_request->url().serialize())); } // https://fetch.spec.whatwg.org/#dom-request-headers @@ -535,11 +531,10 @@ Bindings::RequestDestination Request::destination() const } // https://fetch.spec.whatwg.org/#dom-request-referrer -WebIDL::ExceptionOr Request::referrer() const +String Request::referrer() const { - auto& vm = this->vm(); return m_request->referrer().visit( - [&](Infrastructure::Request::Referrer const& referrer) -> WebIDL::ExceptionOr { + [&](Infrastructure::Request::Referrer const& referrer) { switch (referrer) { // 1. If this’s request’s referrer is "no-referrer", then return the empty string. case Infrastructure::Request::Referrer::NoReferrer: @@ -551,9 +546,9 @@ WebIDL::ExceptionOr Request::referrer() const VERIFY_NOT_REACHED(); } }, - [&](URL::URL const& url) -> WebIDL::ExceptionOr { + [&](URL::URL const& url) { // 3. Return this’s request’s referrer, serialized. - return TRY_OR_THROW_OOM(vm, String::from_byte_string(url.serialize())); + return MUST(String::from_byte_string(url.serialize())); }); } diff --git a/Userland/Libraries/LibWeb/Fetch/Request.h b/Userland/Libraries/LibWeb/Fetch/Request.h index 07cdeede151..064fef649dd 100644 --- a/Userland/Libraries/LibWeb/Fetch/Request.h +++ b/Userland/Libraries/LibWeb/Fetch/Request.h @@ -82,11 +82,11 @@ public: [[nodiscard]] JS::NonnullGCPtr request() const { return m_request; } // JS API functions - [[nodiscard]] WebIDL::ExceptionOr method() const; - [[nodiscard]] WebIDL::ExceptionOr url() const; + [[nodiscard]] String method() const; + [[nodiscard]] String url() const; [[nodiscard]] JS::NonnullGCPtr headers() const; [[nodiscard]] Bindings::RequestDestination destination() const; - [[nodiscard]] WebIDL::ExceptionOr referrer() const; + [[nodiscard]] String referrer() const; [[nodiscard]] Bindings::ReferrerPolicy referrer_policy() const; [[nodiscard]] Bindings::RequestMode mode() const; [[nodiscard]] Bindings::RequestCredentials credentials() const;