diff options
| author | Andreas Kling <kling@serenityos.org> | 2022-08-28 13:42:07 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-09-06 00:27:09 +0200 |
| commit | 6f433c86564c24d47d520cb5bdcc2209d724ac96 (patch) | |
| tree | 886a2f727782e466e99c61c628637872c1b7403f /Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp | |
| parent | bb547ce1c4251e3689287eac845593398a379ca5 (diff) | |
| download | serenity-6f433c86564c24d47d520cb5bdcc2209d724ac96.zip | |
LibWeb+LibJS: Make the EventTarget hierarchy (incl. DOM) GC-allocated
This is a monster patch that turns all EventTargets into GC-allocated
PlatformObjects. Their C++ wrapper classes are removed, and the LibJS
garbage collector is now responsible for their lifetimes.
There's a fair amount of hacks and band-aids in this patch, and we'll
have a lot of cleanup to do after this.
Diffstat (limited to 'Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp')
| -rw-r--r-- | Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp index 150746aff1..eea9c37b95 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp @@ -6,7 +6,6 @@ */ #include <LibWeb/Bindings/MainThreadVM.h> -#include <LibWeb/Bindings/WindowObject.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/HTML/PromiseRejectionEvent.h> #include <LibWeb/HTML/Scripting/Environments.h> @@ -67,7 +66,7 @@ EventLoop& EnvironmentSettingsObject::responsible_event_loop() RunScriptDecision EnvironmentSettingsObject::can_run_script() { // 1. If the global object specified by settings is a Window object whose Document object is not fully active, then return "do not run". - if (is<Bindings::WindowObject>(global_object()) && !verify_cast<Bindings::WindowObject>(global_object()).impl().associated_document().is_fully_active()) + if (is<HTML::Window>(global_object()) && !verify_cast<HTML::Window>(global_object()).associated_document().is_fully_active()) return RunScriptDecision::DoNotRun; // 2. If scripting is disabled for settings, then return "do not run". @@ -218,11 +217,11 @@ void EnvironmentSettingsObject::notify_about_rejected_promises(Badge<EventLoop>) /* .reason = */ promise.result(), }; // FIXME: This currently assumes that global is a WindowObject. - auto& window = verify_cast<Bindings::WindowObject>(*global.cell()); + auto& window = verify_cast<HTML::Window>(*global.cell()); auto promise_rejection_event = PromiseRejectionEvent::create(window, HTML::EventNames::unhandledrejection, event_init); - bool not_handled = window.impl().dispatch_event(*promise_rejection_event); + bool not_handled = window.dispatch_event(*promise_rejection_event); // 3. If notHandled is false, then the promise rejection is handled. Otherwise, the promise rejection is not handled. |