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

WebContent: Convert ConsoleGlobalObject functions to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-31 17:05:46 +02:00
parent 10b93506ad
commit 9d1fb85f93
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Services/WebContent/ConsoleGlobalObject.cpp
View file

@ -28,7 +28,7 @@ void ConsoleGlobalObject::initialize_global_object()
Base::initialize_global_object(); Base::initialize_global_object();
// $0 magic variable // $0 magic variable
define_old_native_accessor("$0", inspected_node_getter, nullptr, 0); define_native_accessor("$0", inspected_node_getter, nullptr, 0);
} }
void ConsoleGlobalObject::visit_edges(Visitor& visitor) void ConsoleGlobalObject::visit_edges(Visitor& visitor)
@ -98,14 +98,12 @@ JS::ThrowCompletionOr<JS::MarkedValueList> ConsoleGlobalObject::internal_own_pro
return m_window_object->internal_own_property_keys(); return m_window_object->internal_own_property_keys();
} }
JS_DEFINE_OLD_NATIVE_FUNCTION(ConsoleGlobalObject::inspected_node_getter) JS_DEFINE_NATIVE_FUNCTION(ConsoleGlobalObject::inspected_node_getter)
{ {
auto* this_object = TRY_OR_DISCARD(vm.this_value(global_object).to_object(global_object)); auto* this_object = TRY(vm.this_value(global_object).to_object(global_object));
if (!is<ConsoleGlobalObject>(this_object)) { if (!is<ConsoleGlobalObject>(this_object))
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "ConsoleGlobalObject"); return vm.throw_completion<JS::TypeError>(global_object, JS::ErrorType::NotAnObjectOfType, "ConsoleGlobalObject");
return {};
}
auto console_global_object = static_cast<ConsoleGlobalObject*>(this_object); auto console_global_object = static_cast<ConsoleGlobalObject*>(this_object);
auto& window = console_global_object->m_window_object->impl(); auto& window = console_global_object->m_window_object->impl();

2
Userland/Services/WebContent/ConsoleGlobalObject.h
View file

@ -41,7 +41,7 @@ private:
virtual void visit_edges(Visitor&) override; virtual void visit_edges(Visitor&) override;
// Because $0 is not a nice C++ function name // Because $0 is not a nice C++ function name
JS_DECLARE_OLD_NATIVE_FUNCTION(inspected_node_getter); JS_DECLARE_NATIVE_FUNCTION(inspected_node_getter);
Web::Bindings::WindowObject* m_window_object; Web::Bindings::WindowObject* m_window_object;
}; };