RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:17:44 +00:00
Code Issues Activity Actions

LibWeb: Support plain (throw) JS::Completion in WebIDL::ExceptionOr

Browse source 
This makes it possible to propagate exceptions from a function that
returns JS::ThrowCompletionOr via TRY() in another function that returns
WebIDL::ExceptionOr.
This commit is contained in:
Linus Groh 2022-09-25 17:52:27 +01:00
parent b9d626d6b2
commit 4461234898
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibWeb/WebIDL/ExceptionOr.h
View file

@ -9,6 +9,7 @@
#include <AK/NonnullRefPtr.h>
#include <AK/Optional.h>
#include <AK/RefPtr.h>
#include <LibJS/Runtime/Completion.h>
#include <LibWeb/WebIDL/DOMException.h>
namespace Web::WebIDL {
@ -59,9 +60,18 @@ public:
{
}
ExceptionOr(Variant<SimpleException, JS::NonnullGCPtr<DOMException>> exception)
: m_exception(move(exception).template downcast<Empty, SimpleException, JS::NonnullGCPtr<DOMException>>())
ExceptionOr(JS::Completion exception)
: m_exception(move(exception))
{
auto const& completion = m_exception.get<JS::Completion>();
VERIFY(completion.is_error());
}
ExceptionOr(Variant<SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion> exception)
: m_exception(move(exception).template downcast<Empty, SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion>())
{
if (auto* completion = m_exception.template get_pointer<JS::Completion>())
VERIFY(completion->is_error());
}
ExceptionOr(ExceptionOr&& other) = default;
@ -78,9 +88,9 @@ public:
return m_result.release_value();
}
Variant<SimpleException, JS::NonnullGCPtr<DOMException>> exception() const
Variant<SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion> exception() const
{
return m_exception.template downcast<SimpleException, JS::NonnullGCPtr<DOMException>>();
return m_exception.template downcast<SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion>();
}
bool is_exception() const
@ -90,13 +100,13 @@ public:
// These are for compatibility with the TRY() macro in AK.
[[nodiscard]] bool is_error() const { return is_exception(); }
Variant<SimpleException, JS::NonnullGCPtr<DOMException>> release_error() { return exception(); }
Variant<SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion> release_error() { return exception(); }
private:
Optional<ValueType> m_result;
// https://webidl.spec.whatwg.org/#idl-exceptions
Variant<Empty, SimpleException, JS::NonnullGCPtr<DOMException>> m_exception {};
Variant<Empty, SimpleException, JS::NonnullGCPtr<DOMException>, JS::Completion> m_exception {};
};
template<>