From 1422bd45ebda117238c452b4cf2ba7d1b54ce453 Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Mon, 7 Mar 2022 23:08:26 +0100
Subject: LibWeb: Move Window from DOM directory & namespace to HTML

The Window object is part of the HTML spec. :^)
https://html.spec.whatwg.org/multipage/window-object.html
---
 Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp           | 2 +-
 .../LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp       | 2 +-
 .../LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h         | 6 +++---
 .../LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Userland/Libraries/LibWeb/HTML/Scripting')

diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp
index df416ba44b..b804e08793 100644
--- a/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp
+++ b/Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp
@@ -8,9 +8,9 @@
 #include <LibWeb/Bindings/MainThreadVM.h>
 #include <LibWeb/Bindings/WindowObject.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/DOM/Window.h>
 #include <LibWeb/HTML/PromiseRejectionEvent.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
+#include <LibWeb/HTML/Window.h>
 
 namespace Web::HTML {
 
diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp
index 089aaed189..14a541e6bb 100644
--- a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp
+++ b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.cpp
@@ -10,7 +10,7 @@
 
 namespace Web::HTML {
 
-WindowEnvironmentSettingsObject::WindowEnvironmentSettingsObject(DOM::Window& window, JS::ExecutionContext& execution_context)
+WindowEnvironmentSettingsObject::WindowEnvironmentSettingsObject(Window& window, JS::ExecutionContext& execution_context)
     : EnvironmentSettingsObject(execution_context)
     , m_window(window)
 {
diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h
index 8577f82e04..e891c4f2bf 100644
--- a/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h
+++ b/Userland/Libraries/LibWeb/HTML/Scripting/WindowEnvironmentSettingsObject.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <LibWeb/DOM/Window.h>
 #include <LibWeb/HTML/Scripting/Environments.h>
+#include <LibWeb/HTML/Window.h>
 
 namespace Web::HTML {
 
@@ -24,9 +24,9 @@ public:
     virtual CanUseCrossOriginIsolatedAPIs cross_origin_isolated_capability() override;
 
 private:
-    WindowEnvironmentSettingsObject(DOM::Window&, JS::ExecutionContext& execution_context);
+    WindowEnvironmentSettingsObject(Window&, JS::ExecutionContext& execution_context);
 
-    NonnullRefPtr<DOM::Window> m_window;
+    NonnullRefPtr<Window> m_window;
 };
 
 }
diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h b/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h
index f31c69bbf0..0dd1e32657 100644
--- a/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h
+++ b/Userland/Libraries/LibWeb/HTML/Scripting/WorkerEnvironmentSettingsObject.h
@@ -13,7 +13,7 @@
 namespace Web::HTML {
 
 // FIXME: This is a bit ugly, this implementation is basically a 1:1 copy of what is in ESO
-//        just modified to use DOM::Document instead of DOM::Window since workers have no window
+//        just modified to use DOM::Document instead of HTML::Window since workers have no window
 class WorkerEnvironmentSettingsObject final
     : public EnvironmentSettingsObject
     , public Weakable<WorkerEnvironmentSettingsObject> {
-- 
cgit v1.2.3