From 8c11a2c2532dff7d9cb9aabd0a0989b2b8859105 Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Thu, 12 Jan 2023 20:39:08 +0000
Subject: [PATCH] LibWebView+Ladybird: Move running JavaScript to
 ViewImplementation

---
 Ladybird/WebContentView.cpp                           | 5 -----
 Ladybird/WebContentView.h                             | 2 --
 Userland/Libraries/LibWebView/OutOfProcessWebView.cpp | 5 -----
 Userland/Libraries/LibWebView/OutOfProcessWebView.h   | 2 --
 Userland/Libraries/LibWebView/ViewImplementation.cpp  | 5 +++++
 Userland/Libraries/LibWebView/ViewImplementation.h    | 2 ++
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp
index 17e1c2d65e..006bf7e83e 100644
--- a/Ladybird/WebContentView.cpp
+++ b/Ladybird/WebContentView.cpp
@@ -446,11 +446,6 @@ void WebContentView::update_viewport_rect()
     request_repaint();
 }
 
-void WebContentView::run_javascript(DeprecatedString const& js_source)
-{
-    client().async_run_javascript(js_source);
-}
-
 void WebContentView::did_output_js_console_message(i32 message_index)
 {
     if (m_console_widget)
diff --git a/Ladybird/WebContentView.h b/Ladybird/WebContentView.h
index 8870ada8e3..8a35c7bc57 100644
--- a/Ladybird/WebContentView.h
+++ b/Ladybird/WebContentView.h
@@ -86,8 +86,6 @@ public:
     virtual void focusOutEvent(QFocusEvent*) override;
     virtual bool event(QEvent*) override;
 
-    void run_javascript(DeprecatedString const& js_source);
-
     void did_output_js_console_message(i32 message_index);
     void did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> message_types, Vector<DeprecatedString> messages);
 
diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp
index de3c440b45..1b0ff1a1b6 100644
--- a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp
+++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp
@@ -552,11 +552,6 @@ void OutOfProcessWebView::js_console_request_messages(i32 start_index)
     client().async_js_console_request_messages(start_index);
 }
 
-void OutOfProcessWebView::run_javascript(StringView js_source)
-{
-    client().async_run_javascript(js_source);
-}
-
 DeprecatedString OutOfProcessWebView::selected_text()
 {
     return client().get_selected_text();
diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.h b/Userland/Libraries/LibWebView/OutOfProcessWebView.h
index a1cf73548c..b06b27d565 100644
--- a/Userland/Libraries/LibWebView/OutOfProcessWebView.h
+++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.h
@@ -36,8 +36,6 @@ public:
     void js_console_input(DeprecatedString const& js_source);
     void js_console_request_messages(i32 start_index);
 
-    void run_javascript(StringView);
-
     DeprecatedString selected_text();
     void select_all();
 
diff --git a/Userland/Libraries/LibWebView/ViewImplementation.cpp b/Userland/Libraries/LibWebView/ViewImplementation.cpp
index 87818c828e..81da873e7a 100644
--- a/Userland/Libraries/LibWebView/ViewImplementation.cpp
+++ b/Userland/Libraries/LibWebView/ViewImplementation.cpp
@@ -104,4 +104,9 @@ void ViewImplementation::debug_request(DeprecatedString const& request, Deprecat
     client().async_debug_request(request, argument);
 }
 
+void ViewImplementation::run_javascript(StringView js_source)
+{
+    client().async_run_javascript(js_source);
+}
+
 }
diff --git a/Userland/Libraries/LibWebView/ViewImplementation.h b/Userland/Libraries/LibWebView/ViewImplementation.h
index 8d88e216b4..8573a085ec 100644
--- a/Userland/Libraries/LibWebView/ViewImplementation.h
+++ b/Userland/Libraries/LibWebView/ViewImplementation.h
@@ -48,6 +48,8 @@ public:
 
     void debug_request(DeprecatedString const& request, DeprecatedString const& argument = {});
 
+    void run_javascript(StringView);
+
     virtual void notify_server_did_layout(Badge<WebContentClient>, Gfx::IntSize content_size) = 0;
     virtual void notify_server_did_paint(Badge<WebContentClient>, i32 bitmap_id) = 0;
     virtual void notify_server_did_invalidate_content_rect(Badge<WebContentClient>, Gfx::IntRect const&) = 0;