From ef711f501e786852642ad8f99af3a42912f9bc95 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Tue, 28 Jul 2020 19:27:41 +0200
Subject: [PATCH] LibWeb: Move the Page/Frame/EventHandler classes into Page/

---
 Applications/Browser/Tab.cpp                      | 2 +-
 Libraries/LibWeb/CMakeLists.txt                   | 6 +++---
 Libraries/LibWeb/CSS/StyleValue.cpp               | 2 +-
 Libraries/LibWeb/DOM/Document.cpp                 | 2 +-
 Libraries/LibWeb/DOM/Window.cpp                   | 2 +-
 Libraries/LibWeb/HTML/HTMLFormElement.cpp         | 2 +-
 Libraries/LibWeb/HTML/HTMLIFrameElement.cpp       | 6 +++---
 Libraries/LibWeb/HTML/HTMLInputElement.cpp        | 2 +-
 Libraries/LibWeb/Layout/LayoutBox.cpp             | 2 +-
 Libraries/LibWeb/Layout/LayoutDocument.cpp        | 2 +-
 Libraries/LibWeb/Layout/LayoutFrame.cpp           | 2 +-
 Libraries/LibWeb/Layout/LayoutNode.cpp            | 2 +-
 Libraries/LibWeb/Layout/LayoutWidget.cpp          | 2 +-
 Libraries/LibWeb/Loader/FrameLoader.cpp           | 6 +++---
 Libraries/LibWeb/{Frame => Page}/EventHandler.cpp | 4 ++--
 Libraries/LibWeb/{Frame => Page}/EventHandler.h   | 0
 Libraries/LibWeb/{Frame => Page}/Frame.cpp        | 2 +-
 Libraries/LibWeb/{Frame => Page}/Frame.h          | 3 +--
 Libraries/LibWeb/{ => Page}/Page.cpp              | 4 ++--
 Libraries/LibWeb/{ => Page}/Page.h                | 0
 Libraries/LibWeb/PageView.cpp                     | 6 +++---
 Libraries/LibWeb/PageView.h                       | 2 +-
 Services/WebContent/PageHost.cpp                  | 2 +-
 Services/WebContent/PageHost.h                    | 2 +-
 24 files changed, 32 insertions(+), 33 deletions(-)
 rename Libraries/LibWeb/{Frame => Page}/EventHandler.cpp (99%)
 rename Libraries/LibWeb/{Frame => Page}/EventHandler.h (100%)
 rename Libraries/LibWeb/{Frame => Page}/Frame.cpp (99%)
 rename Libraries/LibWeb/{Frame => Page}/Frame.h (98%)
 rename Libraries/LibWeb/{ => Page}/Page.cpp (97%)
 rename Libraries/LibWeb/{ => Page}/Page.h (100%)

diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp
index 0303d6ede2050f..5cfa5c9cda9d2a 100644
--- a/Applications/Browser/Tab.cpp
+++ b/Applications/Browser/Tab.cpp
@@ -49,12 +49,12 @@
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/DOMTreeModel.h>
 #include <LibWeb/Dump.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutBlock.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutInline.h>
 #include <LibWeb/Layout/LayoutNode.h>
 #include <LibWeb/Loader/ResourceLoader.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/WebContentView.h>
 
diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt
index 1573c0a74fff69..ecaabe504e92c8 100644
--- a/Libraries/LibWeb/CMakeLists.txt
+++ b/Libraries/LibWeb/CMakeLists.txt
@@ -42,8 +42,6 @@ set(SOURCES
     DOMTreeModel.cpp
     Dump.cpp
     FontCache.cpp
-    Frame/EventHandler.cpp
-    Frame/Frame.cpp
     HTML/CanvasRenderingContext2D.cpp
     HTML/HTMLAnchorElement.cpp
     HTML/HTMLBRElement.cpp
@@ -105,7 +103,9 @@ set(SOURCES
     Loader/ImageResource.cpp
     Loader/Resource.cpp
     Loader/ResourceLoader.cpp
-    Page.cpp
+    Page/EventHandler.cpp
+    Page/Frame.cpp
+    Page/Page.cpp
     PageView.cpp
     Painting/StackingContext.cpp
     SVG/SVGElement.cpp
diff --git a/Libraries/LibWeb/CSS/StyleValue.cpp b/Libraries/LibWeb/CSS/StyleValue.cpp
index 9b6baa658316c6..fe23dbd6368b3c 100644
--- a/Libraries/LibWeb/CSS/StyleValue.cpp
+++ b/Libraries/LibWeb/CSS/StyleValue.cpp
@@ -29,9 +29,9 @@
 #include <LibGfx/Palette.h>
 #include <LibWeb/CSS/StyleValue.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Loader/LoadRequest.h>
 #include <LibWeb/Loader/ResourceLoader.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web::CSS {
diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp
index a2235779a3f0cc..78d2f1785a04cd 100644
--- a/Libraries/LibWeb/DOM/Document.cpp
+++ b/Libraries/LibWeb/DOM/Document.cpp
@@ -46,7 +46,6 @@
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/DOM/Window.h>
 #include <LibWeb/Dump.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/HTML/HTMLHeadElement.h>
 #include <LibWeb/HTML/HTMLHtmlElement.h>
@@ -55,6 +54,7 @@
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutTreeBuilder.h>
 #include <LibWeb/Origin.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/SVG/TagNames.h>
 #include <stdio.h>
diff --git a/Libraries/LibWeb/DOM/Window.cpp b/Libraries/LibWeb/DOM/Window.cpp
index 46adb627b63537..965812574e7c47 100644
--- a/Libraries/LibWeb/DOM/Window.cpp
+++ b/Libraries/LibWeb/DOM/Window.cpp
@@ -32,7 +32,7 @@
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Timer.h>
 #include <LibWeb/DOM/Window.h>
-#include <LibWeb/Frame/Frame.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web::DOM {
diff --git a/Libraries/LibWeb/HTML/HTMLFormElement.cpp b/Libraries/LibWeb/HTML/HTMLFormElement.cpp
index 1ba31f050487be..421339673e73fd 100644
--- a/Libraries/LibWeb/HTML/HTMLFormElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLFormElement.cpp
@@ -27,7 +27,7 @@
 #include <AK/StringBuilder.h>
 #include <LibWeb/HTML/HTMLFormElement.h>
 #include <LibWeb/HTML/HTMLInputElement.h>
-#include <LibWeb/Frame/Frame.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/URLEncoder.h>
 
diff --git a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
index b4534898b9bb2d..c32cab398bc92a 100644
--- a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
@@ -29,15 +29,15 @@
 #include <LibGUI/TextBox.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
+#include <LibWeb/Dump.h>
 #include <LibWeb/HTML/HTMLFormElement.h>
 #include <LibWeb/HTML/HTMLIFrameElement.h>
-#include <LibWeb/Dump.h>
-#include <LibWeb/Frame/Frame.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
 #include <LibWeb/Layout/LayoutFrame.h>
 #include <LibWeb/Layout/LayoutWidget.h>
 #include <LibWeb/Loader/ResourceLoader.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
-#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
 
 namespace Web::HTML {
 
diff --git a/Libraries/LibWeb/HTML/HTMLInputElement.cpp b/Libraries/LibWeb/HTML/HTMLInputElement.cpp
index faf10c6a31f178..cdcb305292a871 100644
--- a/Libraries/LibWeb/HTML/HTMLInputElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLInputElement.cpp
@@ -31,8 +31,8 @@
 #include <LibWeb/DOM/Event.h>
 #include <LibWeb/HTML/HTMLFormElement.h>
 #include <LibWeb/HTML/HTMLInputElement.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutWidget.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web::HTML {
diff --git a/Libraries/LibWeb/Layout/LayoutBox.cpp b/Libraries/LibWeb/Layout/LayoutBox.cpp
index 4a5aa6ef4f8057..e87ae9c4e5173a 100644
--- a/Libraries/LibWeb/Layout/LayoutBox.cpp
+++ b/Libraries/LibWeb/Layout/LayoutBox.cpp
@@ -27,7 +27,7 @@
 #include <LibGUI/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/HTMLBodyElement.h>
-#include <LibWeb/Frame/Frame.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/Layout/LayoutBlock.h>
 #include <LibWeb/Layout/LayoutBox.h>
 
diff --git a/Libraries/LibWeb/Layout/LayoutDocument.cpp b/Libraries/LibWeb/Layout/LayoutDocument.cpp
index ec70d146c8b709..90c364ba49b60a 100644
--- a/Libraries/LibWeb/Layout/LayoutDocument.cpp
+++ b/Libraries/LibWeb/Layout/LayoutDocument.cpp
@@ -25,10 +25,10 @@
  */
 
 #include <LibWeb/Dump.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutImage.h>
 #include <LibWeb/Layout/LayoutWidget.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/Painting/StackingContext.h>
 
 namespace Web {
diff --git a/Libraries/LibWeb/Layout/LayoutFrame.cpp b/Libraries/LibWeb/Layout/LayoutFrame.cpp
index 2246982bcb240f..f63a9e81096044 100644
--- a/Libraries/LibWeb/Layout/LayoutFrame.cpp
+++ b/Libraries/LibWeb/Layout/LayoutFrame.cpp
@@ -30,9 +30,9 @@
 #include <LibGfx/Font.h>
 #include <LibGfx/StylePainter.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutFrame.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web {
diff --git a/Libraries/LibWeb/Layout/LayoutNode.cpp b/Libraries/LibWeb/Layout/LayoutNode.cpp
index 215ec77c93dac4..658abdab1d13cc 100644
--- a/Libraries/LibWeb/Layout/LayoutNode.cpp
+++ b/Libraries/LibWeb/Layout/LayoutNode.cpp
@@ -27,11 +27,11 @@
 #include <LibGUI/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutBlock.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutNode.h>
 #include <LibWeb/Layout/LayoutReplaced.h>
+#include <LibWeb/Page/Frame.h>
 
 namespace Web {
 
diff --git a/Libraries/LibWeb/Layout/LayoutWidget.cpp b/Libraries/LibWeb/Layout/LayoutWidget.cpp
index d4cdd1c50e97ea..e77a9b623a8b75 100644
--- a/Libraries/LibWeb/Layout/LayoutWidget.cpp
+++ b/Libraries/LibWeb/Layout/LayoutWidget.cpp
@@ -30,8 +30,8 @@
 #include <LibGfx/Font.h>
 #include <LibGfx/StylePainter.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutWidget.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web {
diff --git a/Libraries/LibWeb/Loader/FrameLoader.cpp b/Libraries/LibWeb/Loader/FrameLoader.cpp
index 0d34ce9034e3f6..ed82a86120727a 100644
--- a/Libraries/LibWeb/Loader/FrameLoader.cpp
+++ b/Libraries/LibWeb/Loader/FrameLoader.cpp
@@ -31,11 +31,11 @@
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/ElementFactory.h>
 #include <LibWeb/DOM/Text.h>
-#include <LibWeb/Frame/Frame.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
 #include <LibWeb/Loader/FrameLoader.h>
 #include <LibWeb/Loader/ResourceLoader.h>
-#include <LibWeb/Page.h>
-#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
+#include <LibWeb/Page/Frame.h>
+#include <LibWeb/Page/Page.h>
 
 namespace Web {
 
diff --git a/Libraries/LibWeb/Frame/EventHandler.cpp b/Libraries/LibWeb/Page/EventHandler.cpp
similarity index 99%
rename from Libraries/LibWeb/Frame/EventHandler.cpp
rename to Libraries/LibWeb/Page/EventHandler.cpp
index 7bbd5181c2afa9..0bb63b83b4ed90 100644
--- a/Libraries/LibWeb/Frame/EventHandler.cpp
+++ b/Libraries/LibWeb/Page/EventHandler.cpp
@@ -28,11 +28,11 @@
 #include <LibGUI/Window.h>
 #include <LibJS/Runtime/Value.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/Frame/EventHandler.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
 #include <LibWeb/HTML/HTMLIFrameElement.h>
 #include <LibWeb/Layout/LayoutDocument.h>
+#include <LibWeb/Page/EventHandler.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/UIEvents/MouseEvent.h>
 
diff --git a/Libraries/LibWeb/Frame/EventHandler.h b/Libraries/LibWeb/Page/EventHandler.h
similarity index 100%
rename from Libraries/LibWeb/Frame/EventHandler.h
rename to Libraries/LibWeb/Page/EventHandler.h
diff --git a/Libraries/LibWeb/Frame/Frame.cpp b/Libraries/LibWeb/Page/Frame.cpp
similarity index 99%
rename from Libraries/LibWeb/Frame/Frame.cpp
rename to Libraries/LibWeb/Page/Frame.cpp
index b2dafa15339629..5262c8bd362a24 100644
--- a/Libraries/LibWeb/Frame/Frame.cpp
+++ b/Libraries/LibWeb/Page/Frame.cpp
@@ -26,9 +26,9 @@
 
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutWidget.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 
 namespace Web {
diff --git a/Libraries/LibWeb/Frame/Frame.h b/Libraries/LibWeb/Page/Frame.h
similarity index 98%
rename from Libraries/LibWeb/Frame/Frame.h
rename to Libraries/LibWeb/Page/Frame.h
index 4e171adca6f6bd..07d2bf8a1ab343 100644
--- a/Libraries/LibWeb/Frame/Frame.h
+++ b/Libraries/LibWeb/Page/Frame.h
@@ -33,8 +33,8 @@
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/Size.h>
-#include <LibWeb/Frame/EventHandler.h>
 #include <LibWeb/Loader/FrameLoader.h>
+#include <LibWeb/Page/EventHandler.h>
 #include <LibWeb/TreeNode.h>
 
 namespace Web {
@@ -83,7 +83,6 @@ class Frame : public TreeNode<Frame> {
     Gfx::IntPoint to_main_frame_position(const Gfx::IntPoint&);
     Gfx::IntRect to_main_frame_rect(const Gfx::IntRect&);
 
-
 private:
     explicit Frame(DOM::Element& host_element, Frame& main_frame);
     explicit Frame(Page&);
diff --git a/Libraries/LibWeb/Page.cpp b/Libraries/LibWeb/Page/Page.cpp
similarity index 97%
rename from Libraries/LibWeb/Page.cpp
rename to Libraries/LibWeb/Page/Page.cpp
index 73c3eeeb2cb981..f02cfc93853715 100644
--- a/Libraries/LibWeb/Page.cpp
+++ b/Libraries/LibWeb/Page/Page.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibWeb/Frame/Frame.h>
-#include <LibWeb/Page.h>
+#include <LibWeb/Page/Frame.h>
+#include <LibWeb/Page/Page.h>
 #include <LibWeb/PageView.h>
 
 namespace Web {
diff --git a/Libraries/LibWeb/Page.h b/Libraries/LibWeb/Page/Page.h
similarity index 100%
rename from Libraries/LibWeb/Page.h
rename to Libraries/LibWeb/Page/Page.h
diff --git a/Libraries/LibWeb/PageView.cpp b/Libraries/LibWeb/PageView.cpp
index 40e731adbfa653..f8e72d3a4a906f 100644
--- a/Libraries/LibWeb/PageView.cpp
+++ b/Libraries/LibWeb/PageView.cpp
@@ -40,18 +40,18 @@
 #include <LibWeb/DOM/ElementFactory.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/Dump.h>
-#include <LibWeb/Frame/EventHandler.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
 #include <LibWeb/HTML/HTMLImageElement.h>
+#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
 #include <LibWeb/Layout/LayoutBreak.h>
 #include <LibWeb/Layout/LayoutDocument.h>
 #include <LibWeb/Layout/LayoutNode.h>
 #include <LibWeb/Layout/LayoutText.h>
 #include <LibWeb/Loader/ResourceLoader.h>
+#include <LibWeb/Page/EventHandler.h>
+#include <LibWeb/Page/Frame.h>
 #include <LibWeb/PageView.h>
 #include <LibWeb/Painting/PaintContext.h>
-#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
 #include <LibWeb/UIEvents/MouseEvent.h>
 #include <stdio.h>
 
diff --git a/Libraries/LibWeb/PageView.h b/Libraries/LibWeb/PageView.h
index c16f78acb7107b..e3747a7cc680ea 100644
--- a/Libraries/LibWeb/PageView.h
+++ b/Libraries/LibWeb/PageView.h
@@ -29,7 +29,7 @@
 #include <AK/URL.h>
 #include <LibGUI/ScrollableWidget.h>
 #include <LibWeb/DOM/Document.h>
-#include <LibWeb/Page.h>
+#include <LibWeb/Page/Page.h>
 #include <LibWeb/WebViewHooks.h>
 
 namespace Web {
diff --git a/Services/WebContent/PageHost.cpp b/Services/WebContent/PageHost.cpp
index ee17a96ece7c97..c0a2e82e92eee0 100644
--- a/Services/WebContent/PageHost.cpp
+++ b/Services/WebContent/PageHost.cpp
@@ -29,8 +29,8 @@
 #include <AK/SharedBuffer.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/SystemTheme.h>
-#include <LibWeb/Frame/Frame.h>
 #include <LibWeb/Layout/LayoutDocument.h>
+#include <LibWeb/Page/Frame.h>
 #include <WebContent/WebContentClientEndpoint.h>
 
 namespace WebContent {
diff --git a/Services/WebContent/PageHost.h b/Services/WebContent/PageHost.h
index 315f3b940daf20..fc48da1359eada 100644
--- a/Services/WebContent/PageHost.h
+++ b/Services/WebContent/PageHost.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibWeb/Page.h>
+#include <LibWeb/Page/Page.h>
 
 namespace WebContent {