From 55609f744d0293a6596a414f110a2535eb0d0486 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 12 Jan 2023 20:34:08 +0000 Subject: [PATCH] LibWebView+Ladybird: Move debug request 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 b084c82515..17e1c2d65e 100644 --- a/Ladybird/WebContentView.cpp +++ b/Ladybird/WebContentView.cpp @@ -446,11 +446,6 @@ void WebContentView::update_viewport_rect() request_repaint(); } -void WebContentView::debug_request(DeprecatedString const& request, DeprecatedString const& argument) -{ - client().async_debug_request(request, argument); -} - void WebContentView::run_javascript(DeprecatedString const& js_source) { client().async_run_javascript(js_source); diff --git a/Ladybird/WebContentView.h b/Ladybird/WebContentView.h index 4c6ebc43e4..8870ada8e3 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 debug_request(DeprecatedString const& request, DeprecatedString const& argument); - void run_javascript(DeprecatedString const& js_source); void did_output_js_console_message(i32 message_index); diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp index 70cadabefc..de3c440b45 100644 --- a/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp +++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.cpp @@ -542,11 +542,6 @@ void OutOfProcessWebView::request_repaint() client().async_paint(m_client_state.back_bitmap.bitmap->rect().translated(horizontal_scrollbar().value(), vertical_scrollbar().value()), m_client_state.back_bitmap.id); } -void OutOfProcessWebView::debug_request(DeprecatedString const& request, DeprecatedString const& argument) -{ - client().async_debug_request(request, argument); -} - void OutOfProcessWebView::js_console_input(DeprecatedString const& js_source) { client().async_js_console_input(js_source); diff --git a/Userland/Libraries/LibWebView/OutOfProcessWebView.h b/Userland/Libraries/LibWebView/OutOfProcessWebView.h index da68fde498..a1cf73548c 100644 --- a/Userland/Libraries/LibWebView/OutOfProcessWebView.h +++ b/Userland/Libraries/LibWebView/OutOfProcessWebView.h @@ -33,8 +33,6 @@ class OutOfProcessWebView final public: virtual ~OutOfProcessWebView() override; - void debug_request(DeprecatedString const& request, DeprecatedString const& argument = {}); - void js_console_input(DeprecatedString const& js_source); void js_console_request_messages(i32 start_index); diff --git a/Userland/Libraries/LibWebView/ViewImplementation.cpp b/Userland/Libraries/LibWebView/ViewImplementation.cpp index ab3a172982..87818c828e 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.cpp +++ b/Userland/Libraries/LibWebView/ViewImplementation.cpp @@ -99,4 +99,9 @@ i32 ViewImplementation::get_hovered_node_id() return client().get_hovered_node_id(); } +void ViewImplementation::debug_request(DeprecatedString const& request, DeprecatedString const& argument) +{ + client().async_debug_request(request, argument); +} + } diff --git a/Userland/Libraries/LibWebView/ViewImplementation.h b/Userland/Libraries/LibWebView/ViewImplementation.h index b3c27af8a4..8d88e216b4 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.h +++ b/Userland/Libraries/LibWebView/ViewImplementation.h @@ -46,6 +46,8 @@ public: void clear_inspected_dom_node(); i32 get_hovered_node_id(); + void debug_request(DeprecatedString const& request, DeprecatedString const& argument = {}); + virtual void notify_server_did_layout(Badge, Gfx::IntSize content_size) = 0; virtual void notify_server_did_paint(Badge, i32 bitmap_id) = 0; virtual void notify_server_did_invalidate_content_rect(Badge, Gfx::IntRect const&) = 0;