From 22089436edec780e03960ecaa74bfc4930126534 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 14 Dec 2022 17:40:33 +0000 Subject: LibJS: Convert Heap::allocate{,_without_realm}() to NonnullGCPtr --- Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp | 4 ++-- Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp | 2 +- .../LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp | 6 +++--- .../LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Userland/Libraries/LibWeb/HTML/Scripting') diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp index d4dedf47a5..40c2452f22 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp @@ -60,14 +60,14 @@ JS::NonnullGCPtr ClassicScript::create(DeprecatedString filename, script->m_error_to_rethrow = parse_error; // 2. Return script. - return JS::NonnullGCPtr(*script); + return script; } // 12. Set script's record to result. script->m_script_record = *result.release_value(); // 13. Return script. - return JS::NonnullGCPtr(*script); + return script; } // https://html.spec.whatwg.org/multipage/webappapis.html#run-a-classic-script diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp index dfc380302a..a81eb658eb 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp @@ -38,7 +38,7 @@ JS::GCPtr JavaScriptModuleScript::create(DeprecatedStrin auto& realm = settings_object.realm(); // 2. Let script be a new module script that this algorithm will subsequently initialize. - auto* script = realm.heap().allocate(realm, move(base_url), filename, settings_object); + auto script = realm.heap().allocate(realm, move(base_url), filename, settings_object); // 3. Set script's settings object to settings. // NOTE: This was already done when constructing. diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp index b234c6e3d2..ff8585c6ee 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp @@ -38,7 +38,7 @@ void WindowEnvironmentSettingsObject::setup(AK::URL const& creation_url, Nonnull // 3. Let settings object be a new environment settings object whose algorithms are defined as follows: // NOTE: See the functions defined for this class. - auto* settings_object = realm->heap().allocate(*realm, window, move(execution_context)); + auto settings_object = realm->heap().allocate(*realm, window, move(execution_context)); // 4. If reservedEnvironment is non-null, then: if (reserved_environment.has_value()) { @@ -71,8 +71,8 @@ void WindowEnvironmentSettingsObject::setup(AK::URL const& creation_url, Nonnull // 7. Set realm's [[HostDefined]] field to settings object. // Non-Standard: We store the ESO next to the web intrinsics in a custom HostDefined object - auto* intrinsics = realm->heap().allocate(*realm, *realm); - auto host_defined = make(*settings_object, *intrinsics); + auto intrinsics = realm->heap().allocate(*realm, *realm); + auto host_defined = make(settings_object, intrinsics); realm->set_host_defined(move(host_defined)); // Non-Standard: We cannot fully initialize window object until *after* the we set up diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h b/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h index 6280ce7bd5..1fd43d2352 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h @@ -30,14 +30,14 @@ public: auto settings_object = realm->heap().allocate(*realm, move(execution_context)); settings_object->target_browsing_context = nullptr; - auto* intrinsics = realm->heap().allocate(*realm, *realm); - auto host_defined = make(*settings_object, *intrinsics); + auto intrinsics = realm->heap().allocate(*realm, *realm); + auto host_defined = make(settings_object, intrinsics); realm->set_host_defined(move(host_defined)); // FIXME: Shared workers should use the shared worker method Bindings::add_dedicated_worker_exposed_interfaces(realm->global_object(), *realm); - return *settings_object; + return settings_object; } virtual ~WorkerEnvironmentSettingsObject() override = default; -- cgit v1.2.3