diff options
author | Linus Groh <mail@linusgroh.de> | 2022-08-06 01:01:13 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-08-06 12:02:48 +0200 |
commit | c8f1651761dfaaee00348bea3c1080177f3fe8eb (patch) | |
tree | 5e183ff2bdce57d2e5b607fe0860579fa8d68f7f | |
parent | 64b29eb4596976138b2e4f67f8502419e584f1e4 (diff) | |
download | serenity-c8f1651761dfaaee00348bea3c1080177f3fe8eb.zip |
LibJS+LibWeb: Restore type safety of Realm::set_global_object()
The changes from 8a03b17 to allow any JS::Value aren't a good fit, as
shown by the excessive amount of verify_cast needed :^)
-rw-r--r-- | Userland/Libraries/LibJS/Contrib/Test262/$262Object.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Interpreter.h | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/Realm.cpp | 27 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/Realm.h | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Runtime/ShadowRealmConstructor.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Bindings/MainThreadVM.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Document.cpp | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/HTML/Worker.cpp | 6 |
10 files changed, 27 insertions, 36 deletions
diff --git a/Userland/Libraries/LibJS/Contrib/Test262/$262Object.cpp b/Userland/Libraries/LibJS/Contrib/Test262/$262Object.cpp index a07c245a98..23b2e206a3 100644 --- a/Userland/Libraries/LibJS/Contrib/Test262/$262Object.cpp +++ b/Userland/Libraries/LibJS/Contrib/Test262/$262Object.cpp @@ -61,7 +61,7 @@ JS_DEFINE_NATIVE_FUNCTION($262Object::create_realm) VERIFY(realm); auto* realm_global_object = vm.heap().allocate_without_global_object<GlobalObject>(*realm); VERIFY(realm_global_object); - realm->set_global_object(realm_global_object, js_undefined()); + realm->set_global_object(realm_global_object, nullptr); realm_global_object->set_associated_realm(*realm); realm_global_object->initialize_global_object(); return Value(realm_global_object->$262()); diff --git a/Userland/Libraries/LibJS/Interpreter.h b/Userland/Libraries/LibJS/Interpreter.h index f517221123..d48562c50d 100644 --- a/Userland/Libraries/LibJS/Interpreter.h +++ b/Userland/Libraries/LibJS/Interpreter.h @@ -47,13 +47,11 @@ public: interpreter->m_global_execution_context = MUST(Realm::initialize_host_defined_realm( vm, - [&](Realm& realm) -> Value { + [&](Realm& realm) -> GlobalObject* { global_object = interpreter->heap().allocate_without_global_object<GlobalObjectType>(realm, forward<Args>(args)...); return global_object; }, - [](Realm&) -> Value { - return js_undefined(); - })); + nullptr)); // NOTE: These are not in the spec. static FlyString global_execution_context_name = "(global execution context)"; diff --git a/Userland/Libraries/LibJS/Runtime/Realm.cpp b/Userland/Libraries/LibJS/Runtime/Realm.cpp index f6dfddcab0..54a5061037 100644 --- a/Userland/Libraries/LibJS/Runtime/Realm.cpp +++ b/Userland/Libraries/LibJS/Runtime/Realm.cpp @@ -21,7 +21,7 @@ Realm* Realm::create(VM& vm) } // 9.6 InitializeHostDefinedRealm ( ), https://tc39.es/ecma262/#sec-initializehostdefinedrealm -ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> Realm::initialize_host_defined_realm(VM& vm, Function<Value(Realm&)> create_global_object, Function<Value(Realm&)> create_global_this_value) +ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> Realm::initialize_host_defined_realm(VM& vm, Function<GlobalObject*(Realm&)> create_global_object, Function<GlobalObject*(Realm&)> create_global_this_value) { DeferGC defer_gc(vm.heap()); @@ -46,20 +46,16 @@ ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> Realm::initialize_host_define // 7. If the host requires use of an exotic object to serve as realm's global object, // let global be such an object created in a host-defined manner. // Otherwise, let global be undefined, indicating that an ordinary object should be created as the global object. - Value global; + GlobalObject* global = nullptr; if (create_global_object) global = create_global_object(*realm); - else - global = js_undefined(); // 8. If the host requires that the this binding in realm's global scope return an object other than the global object, // let thisValue be such an object created in a host-defined manner. // Otherwise, let thisValue be undefined, indicating that realm's global this binding should be the global object. - Value this_value; + GlobalObject* this_value = nullptr; if (create_global_this_value) this_value = create_global_this_value(*realm); - else - this_value = js_undefined(); // 9. Perform SetRealmGlobalObject(realm, global, thisValue). realm->set_global_object(global, this_value); @@ -75,34 +71,33 @@ ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> Realm::initialize_host_define } // 9.3.3 SetRealmGlobalObject ( realmRec, globalObj, thisValue ), https://tc39.es/ecma262/#sec-setrealmglobalobject -void Realm::set_global_object(Value global_object, Value this_value) +void Realm::set_global_object(GlobalObject* global_object, GlobalObject* this_value) { // 1. If globalObj is undefined, then - if (global_object.is_undefined()) { + if (global_object == nullptr) { // NOTE: Step 1 is not supported, the global object must be allocated elsewhere. VERIFY_NOT_REACHED(); } // 2. Assert: Type(globalObj) is Object. - VERIFY(global_object.is_object()); - VERIFY(is<GlobalObject>(global_object.as_object())); + VERIFY(global_object); // Non-standard - verify_cast<GlobalObject>(global_object.as_object()).set_associated_realm(*this); + global_object->set_associated_realm(*this); // 3. If thisValue is undefined, set thisValue to globalObj. - if (this_value.is_undefined()) + if (this_value == nullptr) this_value = global_object; // Non-standard - VERIFY(this_value.is_object()); + VERIFY(this_value); // 4. Set realmRec.[[GlobalObject]] to globalObj. - m_global_object = &verify_cast<GlobalObject>(global_object.as_object()); + m_global_object = global_object; // 5. Let newGlobalEnv be NewGlobalEnvironment(globalObj, thisValue). // 6. Set realmRec.[[GlobalEnv]] to newGlobalEnv. - m_global_environment = m_global_object->heap().allocate_without_global_object<GlobalEnvironment>(verify_cast<GlobalObject>(global_object.as_object()), this_value.as_object()); + m_global_environment = m_global_object->heap().allocate_without_global_object<GlobalEnvironment>(*global_object, *this_value); // 7. Return unused. } diff --git a/Userland/Libraries/LibJS/Runtime/Realm.h b/Userland/Libraries/LibJS/Runtime/Realm.h index 01a6897a30..9739a09641 100644 --- a/Userland/Libraries/LibJS/Runtime/Realm.h +++ b/Userland/Libraries/LibJS/Runtime/Realm.h @@ -26,9 +26,9 @@ public: Realm() = default; static Realm* create(VM&); - static ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> initialize_host_defined_realm(VM&, Function<Value(Realm&)> create_global_object, Function<Value(Realm&)> create_global_this_value); + static ThrowCompletionOr<NonnullOwnPtr<ExecutionContext>> initialize_host_defined_realm(VM&, Function<GlobalObject*(Realm&)> create_global_object, Function<GlobalObject*(Realm&)> create_global_this_value); - void set_global_object(Value global_object, Value this_value); + void set_global_object(GlobalObject* global_object, GlobalObject* this_value); [[nodiscard]] GlobalObject& global_object() const { return *m_global_object; } [[nodiscard]] GlobalEnvironment& global_environment() const { return *m_global_environment; } diff --git a/Userland/Libraries/LibJS/Runtime/ShadowRealmConstructor.cpp b/Userland/Libraries/LibJS/Runtime/ShadowRealmConstructor.cpp index 8224d566af..8af021d892 100644 --- a/Userland/Libraries/LibJS/Runtime/ShadowRealmConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/ShadowRealmConstructor.cpp @@ -64,7 +64,7 @@ ThrowCompletionOr<Object*> ShadowRealmConstructor::construct(FunctionObject& new // 10. Perform ? SetRealmGlobalObject(realmRec, undefined, undefined). auto* new_global_object = vm.heap().allocate_without_global_object<GlobalObject>(*realm); - realm->set_global_object(new_global_object, js_undefined()); + realm->set_global_object(new_global_object, nullptr); new_global_object->initialize_global_object(); // TODO: I don't think we should have these exactly like this, that doesn't work well with how diff --git a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp index 27e24424d2..27860fbb44 100644 --- a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp +++ b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp @@ -367,7 +367,7 @@ void queue_mutation_observer_microtask(DOM::Document& document) } // https://html.spec.whatwg.org/multipage/webappapis.html#creating-a-new-javascript-realm -NonnullOwnPtr<JS::ExecutionContext> create_a_new_javascript_realm(JS::VM& vm, Function<JS::Value(JS::Realm&)> create_global_object, Function<JS::Value(JS::Realm&)> create_global_this_value) +NonnullOwnPtr<JS::ExecutionContext> create_a_new_javascript_realm(JS::VM& vm, Function<JS::GlobalObject*(JS::Realm&)> create_global_object, Function<JS::GlobalObject*(JS::Realm&)> create_global_this_value) { // 1. Perform InitializeHostDefinedRealm() with the provided customizations for creating the global object and the global this binding. // 2. Let realm execution context be the running JavaScript execution context. diff --git a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.h b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.h index cea1de14ee..83a15a414d 100644 --- a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.h +++ b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.h @@ -49,6 +49,6 @@ struct WebEngineCustomJobCallbackData final : public JS::JobCallback::CustomData HTML::ClassicScript* active_script(); JS::VM& main_thread_vm(); void queue_mutation_observer_microtask(DOM::Document&); -NonnullOwnPtr<JS::ExecutionContext> create_a_new_javascript_realm(JS::VM&, Function<JS::Value(JS::Realm&)> create_global_object, Function<JS::Value(JS::Realm&)> create_global_this_value); +NonnullOwnPtr<JS::ExecutionContext> create_a_new_javascript_realm(JS::VM&, Function<JS::GlobalObject*(JS::Realm&)> create_global_object, Function<JS::GlobalObject*(JS::Realm&)> create_global_this_value); } diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 3c25b51f47..c72e5dbe8a 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -168,16 +168,16 @@ NonnullRefPtr<Document> Document::create_and_initialize(Type type, String conten // 5. Let realm execution context be the result of creating a new JavaScript realm given agent and the following customizations: auto realm_execution_context = Bindings::create_a_new_javascript_realm( Bindings::main_thread_vm(), - [&](JS::Realm& realm) -> JS::Value { + [&](JS::Realm& realm) -> JS::GlobalObject* { // - For the global object, create a new Window object. window = HTML::Window::create(); auto* global_object = realm.heap().allocate_without_global_object<Bindings::WindowObject>(realm, *window); VERIFY(window->wrapper() == global_object); return global_object; }, - [](JS::Realm&) -> JS::Value { + [](JS::Realm&) -> JS::GlobalObject* { // FIXME: - For the global this binding, use browsingContext's WindowProxy object. - return JS::js_undefined(); + return nullptr; }); // 6. Let topLevelCreationURL be creationURL. diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp index b927355efc..e2c0e665f5 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp @@ -121,16 +121,16 @@ NonnullRefPtr<BrowsingContext> BrowsingContext::create_a_new_browsing_context(Pa // 8. Let realm execution context be the result of creating a new JavaScript realm given agent and the following customizations: auto realm_execution_context = Bindings::create_a_new_javascript_realm( Bindings::main_thread_vm(), - [&](JS::Realm& realm) -> JS::Value { + [&](JS::Realm& realm) -> JS::GlobalObject* { // - For the global object, create a new Window object. window = HTML::Window::create(); auto* global_object = realm.heap().allocate_without_global_object<Bindings::WindowObject>(realm, *window); VERIFY(window->wrapper() == global_object); return global_object; }, - [](JS::Realm&) -> JS::Value { + [](JS::Realm&) -> JS::GlobalObject* { // FIXME: - For the global this binding, use browsingContext's WindowProxy object. - return JS::js_undefined(); + return nullptr; }); // 9. Let topLevelCreationURL be about:blank if embedder is null; otherwise embedder's relevant settings object's top-level creation URL. diff --git a/Userland/Libraries/LibWeb/HTML/Worker.cpp b/Userland/Libraries/LibWeb/HTML/Worker.cpp index 1c0212d55a..e1b9f108d7 100644 --- a/Userland/Libraries/LibWeb/HTML/Worker.cpp +++ b/Userland/Libraries/LibWeb/HTML/Worker.cpp @@ -102,7 +102,7 @@ void Worker::run_a_worker(AK::URL& url, EnvironmentSettingsObject& outside_setti // 7. Let realm execution context be the result of creating a new JavaScript realm given agent and the following customizations: auto realm_execution_context = Bindings::create_a_new_javascript_realm( *m_worker_vm, - [&](JS::Realm& realm) -> JS::Value { + [&](JS::Realm& realm) -> JS::GlobalObject* { // 7a. For the global object, if is shared is true, create a new SharedWorkerGlobalScope object. // 7b. Otherwise, create a new DedicatedWorkerGlobalScope object. // FIXME: Proper support for both SharedWorkerGlobalScope and DedicatedWorkerGlobalScope @@ -113,9 +113,7 @@ void Worker::run_a_worker(AK::URL& url, EnvironmentSettingsObject& outside_setti m_worker_scope = m_worker_vm->heap().allocate_without_global_object<JS::GlobalObject>(realm); return m_worker_scope; }, - [&](JS::Realm&) -> JS::Value { - return JS::js_undefined(); - }); + nullptr); m_worker_realm = realm_execution_context->realm; m_console = adopt_ref(*new WorkerDebugConsoleClient(m_worker_scope->console())); |