RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:28:11 +00:00
Code Issues Activity Actions

LibWeb/HTML: Propagate errors from Window::initialize_web_interfaces()

Browse source
This commit is contained in:
Linus Groh 2023-03-05 21:22:34 +00:00
parent 8110cf9fab
commit cc1e8a4e9f
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp
View file

@ -77,7 +77,7 @@ WebIDL::ExceptionOr<void> WindowEnvironmentSettingsObject::setup(AK::URL const&
// Non-Standard: We cannot fully initialize window object until *after* the we set up // Non-Standard: We cannot fully initialize window object until *after* the we set up
// the realm's [[HostDefined]] internal slot as the internal slot contains the web platform intrinsics // the realm's [[HostDefined]] internal slot as the internal slot contains the web platform intrinsics
window.initialize_web_interfaces({}); TRY(window.initialize_web_interfaces({}));
return {}; return {};
} }

15
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -1111,14 +1111,16 @@ Vector<JS::NonnullGCPtr<MimeType>> Window::pdf_viewer_mime_type_objects()
return m_pdf_viewer_mime_type_objects; return m_pdf_viewer_mime_type_objects;
} }
void Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>) WebIDL::ExceptionOr<void> Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>)
{ {
auto& realm = this->realm(); auto& realm = this->realm();
add_window_exposed_interfaces(*this); add_window_exposed_interfaces(*this);
Object::set_prototype(&Bindings::ensure_web_prototype<Bindings::WindowPrototype>(realm, "Window")); Object::set_prototype(&Bindings::ensure_web_prototype<Bindings::WindowPrototype>(realm, "Window"));
m_crypto = Crypto::Crypto::create(realm).release_value_but_fixme_should_propagate_errors(); m_crypto = MUST_OR_THROW_OOM(heap().allocate<Crypto::Crypto>(realm, realm));
m_location = MUST_OR_THROW_OOM(heap().allocate<Location>(realm, realm));
m_navigator = MUST_OR_THROW_OOM(heap().allocate<Navigator>(realm, realm));
// FIXME: These should be native accessors, not properties // FIXME: These should be native accessors, not properties
define_native_accessor(realm, "top", top_getter, nullptr, JS::Attribute::Enumerable); define_native_accessor(realm, "top", top_getter, nullptr, JS::Attribute::Enumerable);
@ -1184,7 +1186,7 @@ void Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>)
define_native_accessor(realm, "outerWidth", outer_width_getter, {}, attr); define_native_accessor(realm, "outerWidth", outer_width_getter, {}, attr);
define_native_accessor(realm, "outerHeight", outer_height_getter, {}, attr); define_native_accessor(realm, "outerHeight", outer_height_getter, {}, attr);
define_direct_property("CSS", heap().allocate<Bindings::CSSNamespace>(realm, realm).release_allocated_value_but_fixme_should_propagate_errors(), 0); define_direct_property("CSS", MUST_OR_THROW_OOM(heap().allocate<Bindings::CSSNamespace>(realm, realm)), 0);
define_native_accessor(realm, "localStorage", local_storage_getter, {}, attr); define_native_accessor(realm, "localStorage", local_storage_getter, {}, attr);
define_native_accessor(realm, "sessionStorage", session_storage_getter, {}, attr); define_native_accessor(realm, "sessionStorage", session_storage_getter, {}, attr);
@ -1194,9 +1196,6 @@ void Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>)
// Legacy // Legacy
define_native_accessor(realm, "event", event_getter, event_setter, JS::Attribute::Enumerable); define_native_accessor(realm, "event", event_getter, event_setter, JS::Attribute::Enumerable);
m_location = heap().allocate<HTML::Location>(realm, realm).release_allocated_value_but_fixme_should_propagate_errors();
m_navigator = heap().allocate<HTML::Navigator>(realm, realm).release_allocated_value_but_fixme_should_propagate_errors();
define_native_accessor(realm, "navigator", navigator_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable); define_native_accessor(realm, "navigator", navigator_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable);
define_native_accessor(realm, "clientInformation", navigator_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable); define_native_accessor(realm, "clientInformation", navigator_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable);
@ -1204,7 +1203,7 @@ void Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>)
define_native_accessor(realm, "location", location_getter, location_setter, JS::Attribute::Enumerable); define_native_accessor(realm, "location", location_getter, location_setter, JS::Attribute::Enumerable);
// WebAssembly "namespace" // WebAssembly "namespace"
define_direct_property("WebAssembly", heap().allocate<Bindings::WebAssemblyObject>(realm, realm).release_allocated_value_but_fixme_should_propagate_errors(), JS::Attribute::Enumerable | JS::Attribute::Configurable); define_direct_property("WebAssembly", MUST_OR_THROW_OOM(heap().allocate<Bindings::WebAssemblyObject>(realm, realm)), JS::Attribute::Enumerable | JS::Attribute::Configurable);
// HTML::GlobalEventHandlers and HTML::WindowEventHandlers // HTML::GlobalEventHandlers and HTML::WindowEventHandlers
#define __ENUMERATE(attribute, event_name) \ #define __ENUMERATE(attribute, event_name) \
@ -1212,6 +1211,8 @@ void Window::initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>)
ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE); ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE);
ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE); ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE);
#undef __ENUMERATE #undef __ENUMERATE
return {};
} }
HTML::Origin Window::origin() const HTML::Origin Window::origin() const

2
Userland/Libraries/LibWeb/HTML/Window.h
View file

@ -137,7 +137,7 @@ public:
// https://html.spec.whatwg.org/multipage/interaction.html#transient-activation // https://html.spec.whatwg.org/multipage/interaction.html#transient-activation
bool has_transient_activation() const; bool has_transient_activation() const;
void initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>); WebIDL::ExceptionOr<void> initialize_web_interfaces(Badge<WindowEnvironmentSettingsObject>);
Vector<JS::NonnullGCPtr<Plugin>> pdf_viewer_plugin_objects(); Vector<JS::NonnullGCPtr<Plugin>> pdf_viewer_plugin_objects();
Vector<JS::NonnullGCPtr<MimeType>> pdf_viewer_mime_type_objects(); Vector<JS::NonnullGCPtr<MimeType>> pdf_viewer_mime_type_objects();