From 794ebb699c72e0e2768b7a6380c963150183daa0 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Wed, 10 Feb 2021 08:25:35 +0100
Subject: [PATCH] LibWeb: Remove low-hanging LibGUI fruit from LibWeb

We'll want to remove the LibGUI dependency from the WebContent process.
This is the first basic step of removing unnecessary LibGUI includes
and swapping out GUI::Painter for Gfx::Painter.
---
 Userland/Libraries/LibWeb/DOM/Document.cpp             | 3 ---
 Userland/Libraries/LibWeb/DumpLayoutTree/main.cpp      | 1 +
 Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp   | 2 --
 Userland/Libraries/LibWeb/Layout/BlockBox.cpp          | 2 +-
 Userland/Libraries/LibWeb/Layout/Box.cpp               | 2 +-
 Userland/Libraries/LibWeb/Layout/ButtonBox.cpp         | 2 +-
 Userland/Libraries/LibWeb/Layout/CanvasBox.cpp         | 3 +--
 Userland/Libraries/LibWeb/Layout/CheckBox.cpp          | 2 +-
 Userland/Libraries/LibWeb/Layout/FrameBox.cpp          | 5 +----
 Userland/Libraries/LibWeb/Layout/ImageBox.cpp          | 2 +-
 Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp   | 2 +-
 Userland/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp | 2 +-
 Userland/Libraries/LibWeb/Layout/Node.cpp              | 2 +-
 Userland/Libraries/LibWeb/Layout/SVGBox.cpp            | 3 +--
 Userland/Libraries/LibWeb/Layout/TextNode.cpp          | 2 +-
 Userland/Libraries/LibWeb/Page/Page.h                  | 6 ++++--
 16 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp
index 561c97412cb..2dc6736c3c3 100644
--- a/Userland/Libraries/LibWeb/DOM/Document.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Document.cpp
@@ -27,9 +27,6 @@
 #include <AK/StringBuilder.h>
 #include <AK/Utf8View.h>
 #include <LibCore/Timer.h>
-#include <LibGUI/Application.h>
-#include <LibGUI/DisplayLink.h>
-#include <LibGUI/MessageBox.h>
 #include <LibJS/Interpreter.h>
 #include <LibJS/Parser.h>
 #include <LibJS/Runtime/Function.h>
diff --git a/Userland/Libraries/LibWeb/DumpLayoutTree/main.cpp b/Userland/Libraries/LibWeb/DumpLayoutTree/main.cpp
index dd8353671f9..2ce6a6bd713 100644
--- a/Userland/Libraries/LibWeb/DumpLayoutTree/main.cpp
+++ b/Userland/Libraries/LibWeb/DumpLayoutTree/main.cpp
@@ -26,6 +26,7 @@
 
 #include <LibCore/ArgsParser.h>
 #include <LibGUI/Application.h>
+#include <LibGUI/Window.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/InProcessWebView.h>
 #include <LibWeb/Layout/InitialContainingBlockBox.h>
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
index a5b6098e52e..d4fe2cb37f1 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
+++ b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
@@ -24,8 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Button.h>
-#include <LibGUI/TextBox.h>
 #include <LibWeb/Bindings/WindowObject.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Event.h>
diff --git a/Userland/Libraries/LibWeb/Layout/BlockBox.cpp b/Userland/Libraries/LibWeb/Layout/BlockBox.cpp
index 229b5c66887..59584ada80a 100644
--- a/Userland/Libraries/LibWeb/Layout/BlockBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/BlockBox.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/CSS/StyleResolver.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/Layout/BlockBox.h>
diff --git a/Userland/Libraries/LibWeb/Layout/Box.cpp b/Userland/Libraries/LibWeb/Layout/Box.cpp
index 9c468252a82..869804e1e8d 100644
--- a/Userland/Libraries/LibWeb/Layout/Box.cpp
+++ b/Userland/Libraries/LibWeb/Layout/Box.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/HTMLBodyElement.h>
 #include <LibWeb/Layout/BlockBox.h>
diff --git a/Userland/Libraries/LibWeb/Layout/ButtonBox.cpp b/Userland/Libraries/LibWeb/Layout/ButtonBox.cpp
index c0b3706e28a..c458206e3e5 100644
--- a/Userland/Libraries/LibWeb/Layout/ButtonBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/ButtonBox.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <LibGUI/Event.h>
-#include <LibGUI/Painter.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
 #include <LibGfx/StylePainter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Layout/ButtonBox.h>
diff --git a/Userland/Libraries/LibWeb/Layout/CanvasBox.cpp b/Userland/Libraries/LibWeb/Layout/CanvasBox.cpp
index 8eb3c7298d0..3d68f88aeb6 100644
--- a/Userland/Libraries/LibWeb/Layout/CanvasBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/CanvasBox.cpp
@@ -24,8 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
-#include <LibGfx/StylePainter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/Layout/CanvasBox.h>
 
 namespace Web::Layout {
diff --git a/Userland/Libraries/LibWeb/Layout/CheckBox.cpp b/Userland/Libraries/LibWeb/Layout/CheckBox.cpp
index a259e4f2d5e..18e029a8533 100644
--- a/Userland/Libraries/LibWeb/Layout/CheckBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/CheckBox.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <LibGUI/Event.h>
-#include <LibGUI/Painter.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
 #include <LibGfx/StylePainter.h>
 #include <LibWeb/Layout/CheckBox.h>
 #include <LibWeb/Page/Frame.h>
diff --git a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp
index 5001b7d7a2a..f3210ad941b 100644
--- a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp
@@ -25,10 +25,7 @@
  */
 
 #include <AK/Debug.h>
-#include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
-#include <LibGUI/Widget.h>
-#include <LibGfx/StylePainter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/InProcessWebView.h>
 #include <LibWeb/Layout/FrameBox.h>
diff --git a/Userland/Libraries/LibWeb/Layout/ImageBox.cpp b/Userland/Libraries/LibWeb/Layout/ImageBox.cpp
index 18a42cc7c9c..cb83ea45995 100644
--- a/Userland/Libraries/LibWeb/Layout/ImageBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/ImageBox.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
 #include <LibGfx/FontDatabase.h>
+#include <LibGfx/Painter.h>
 #include <LibGfx/StylePainter.h>
 #include <LibWeb/Layout/ImageBox.h>
 #include <LibWeb/Page/Frame.h>
diff --git a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
index 3e99817db55..8770f7d1a3b 100644
--- a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
+++ b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/Utf8View.h>
-#include <LibGUI/Painter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/Layout/InitialContainingBlockBox.h>
 #include <LibWeb/Layout/LineBoxFragment.h>
 #include <LibWeb/Layout/TextNode.h>
diff --git a/Userland/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp b/Userland/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp
index 2b387112e6f..995f8039a2f 100644
--- a/Userland/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/Layout/ListItemMarkerBox.h>
 
 namespace Web::Layout {
diff --git a/Userland/Libraries/LibWeb/Layout/Node.cpp b/Userland/Libraries/LibWeb/Layout/Node.cpp
index 4b08ff1b208..cd282b4d69d 100644
--- a/Userland/Libraries/LibWeb/Layout/Node.cpp
+++ b/Userland/Libraries/LibWeb/Layout/Node.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/Demangle.h>
-#include <LibGUI/Painter.h>
 #include <LibGfx/FontDatabase.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Dump.h>
 #include <LibWeb/HTML/HTMLHtmlElement.h>
diff --git a/Userland/Libraries/LibWeb/Layout/SVGBox.cpp b/Userland/Libraries/LibWeb/Layout/SVGBox.cpp
index 2600198b61c..d0e5cc88d01 100644
--- a/Userland/Libraries/LibWeb/Layout/SVGBox.cpp
+++ b/Userland/Libraries/LibWeb/Layout/SVGBox.cpp
@@ -24,8 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/Painter.h>
-#include <LibGfx/StylePainter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/Layout/SVGBox.h>
 
 namespace Web::Layout {
diff --git a/Userland/Libraries/LibWeb/Layout/TextNode.cpp b/Userland/Libraries/LibWeb/Layout/TextNode.cpp
index 04c23a3403b..1e1603029db 100644
--- a/Userland/Libraries/LibWeb/Layout/TextNode.cpp
+++ b/Userland/Libraries/LibWeb/Layout/TextNode.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <AK/Utf8View.h>
-#include <LibGUI/Painter.h>
+#include <LibGfx/Painter.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Layout/BlockBox.h>
 #include <LibWeb/Layout/InlineFormattingContext.h>
diff --git a/Userland/Libraries/LibWeb/Page/Page.h b/Userland/Libraries/LibWeb/Page/Page.h
index 375bc3c75f7..fb944634822 100644
--- a/Userland/Libraries/LibWeb/Page/Page.h
+++ b/Userland/Libraries/LibWeb/Page/Page.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,10 +30,12 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/URL.h>
+#include <AK/WeakPtr.h>
+#include <AK/Weakable.h>
 #include <Kernel/API/KeyCode.h>
-#include <LibGUI/Window.h>
 #include <LibGfx/Forward.h>
 #include <LibGfx/Palette.h>
+#include <LibGfx/StandardCursor.h>
 #include <LibWeb/Forward.h>
 
 namespace Web {