From 2aeed210d905e498aed7b8d4f9f5b58c809e479a Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 25 Mar 2025 10:11:17 -0400 Subject: [PATCH] LibWebView+WebContent: Remove "styled" JS console IPC hooks This was used by the built-in Inspector to send HTML-ified JS console messages to the browser. It is no longer used. --- Libraries/LibWebView/Application.cpp | 4 ++-- Libraries/LibWebView/ViewImplementation.h | 3 +-- Libraries/LibWebView/WebContentClient.cpp | 14 +++----------- Libraries/LibWebView/WebContentClient.h | 3 +-- Services/WebContent/DevToolsConsoleClient.cpp | 2 +- Services/WebContent/PageClient.cpp | 9 ++------- Services/WebContent/PageClient.h | 3 +-- Services/WebContent/WebContentClient.ipc | 3 +-- 8 files changed, 12 insertions(+), 29 deletions(-) diff --git a/Libraries/LibWebView/Application.cpp b/Libraries/LibWebView/Application.cpp index 9119e8e22b1..b86f909a800 100644 --- a/Libraries/LibWebView/Application.cpp +++ b/Libraries/LibWebView/Application.cpp @@ -730,7 +730,7 @@ void Application::listen_for_console_messages(DevTools::TabDescription const& de return; view->on_console_message_available = move(on_console_message_available); - view->on_received_unstyled_console_messages = move(on_received_console_output); + view->on_received_console_messages = move(on_received_console_output); view->js_console_request_messages(0); } @@ -741,7 +741,7 @@ void Application::stop_listening_for_console_messages(DevTools::TabDescription c return; view->on_console_message_available = nullptr; - view->on_received_unstyled_console_messages = nullptr; + view->on_received_console_messages = nullptr; } void Application::request_console_messages(DevTools::TabDescription const& description, i32 start_index) const diff --git a/Libraries/LibWebView/ViewImplementation.h b/Libraries/LibWebView/ViewImplementation.h index c213093762e..5bd697d0e1b 100644 --- a/Libraries/LibWebView/ViewImplementation.h +++ b/Libraries/LibWebView/ViewImplementation.h @@ -212,8 +212,7 @@ public: Function on_received_style_sheet_source; Function on_received_js_console_result; Function on_console_message_available; - Function const& message_types, Vector const& messages)> on_received_styled_console_messages; - Function)> on_received_unstyled_console_messages; + Function)> on_received_console_messages; Function on_resource_status_change; Function on_restore_window; Function on_reposition_window; diff --git a/Libraries/LibWebView/WebContentClient.cpp b/Libraries/LibWebView/WebContentClient.cpp index cd7d0e7bacb..dfb93a78821 100644 --- a/Libraries/LibWebView/WebContentClient.cpp +++ b/Libraries/LibWebView/WebContentClient.cpp @@ -393,19 +393,11 @@ void WebContentClient::did_output_js_console_message(u64 page_id, i32 message_in } } -void WebContentClient::did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) +void WebContentClient::did_get_js_console_messages(u64 page_id, i32 start_index, Vector console_output) { if (auto view = view_for_page_id(page_id); view.has_value()) { - if (view->on_received_styled_console_messages) - view->on_received_styled_console_messages(start_index, message_types, messages); - } -} - -void WebContentClient::did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector console_output) -{ - if (auto view = view_for_page_id(page_id); view.has_value()) { - if (view->on_received_unstyled_console_messages) - view->on_received_unstyled_console_messages(start_index, move(console_output)); + if (view->on_received_console_messages) + view->on_received_console_messages(start_index, move(console_output)); } } diff --git a/Libraries/LibWebView/WebContentClient.h b/Libraries/LibWebView/WebContentClient.h index fcb738385c1..d1b85cac40d 100644 --- a/Libraries/LibWebView/WebContentClient.h +++ b/Libraries/LibWebView/WebContentClient.h @@ -89,8 +89,7 @@ private: virtual void did_get_internal_page_info(u64 page_id, PageInfoType, String) override; virtual void did_execute_js_console_input(u64 page_id, JsonValue) override; virtual void did_output_js_console_message(u64 page_id, i32 message_index) override; - virtual void did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) override; - virtual void did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector) override; + virtual void did_get_js_console_messages(u64 page_id, i32 start_index, Vector) override; virtual void did_change_favicon(u64 page_id, Gfx::ShareableBitmap) override; virtual void did_request_alert(u64 page_id, String) override; virtual void did_request_confirm(u64 page_id, String) override; diff --git a/Services/WebContent/DevToolsConsoleClient.cpp b/Services/WebContent/DevToolsConsoleClient.cpp index 45fccf69491..fcef20961f1 100644 --- a/Services/WebContent/DevToolsConsoleClient.cpp +++ b/Services/WebContent/DevToolsConsoleClient.cpp @@ -115,7 +115,7 @@ void DevToolsConsoleClient::send_messages(i32 start_index) return; } - m_client->did_get_unstyled_js_console_messages(start_index, m_console_output.span().slice(start_index)); + m_client->did_get_js_console_messages(start_index, m_console_output.span().slice(start_index)); } // 2.3. Printer(logLevel, args[, options]), https://console.spec.whatwg.org/#printer diff --git a/Services/WebContent/PageClient.cpp b/Services/WebContent/PageClient.cpp index 044c979a9ee..ad9f06783b9 100644 --- a/Services/WebContent/PageClient.cpp +++ b/Services/WebContent/PageClient.cpp @@ -803,14 +803,9 @@ void PageClient::console_peer_did_misbehave(char const* reason) client().did_misbehave(reason); } -void PageClient::did_get_styled_js_console_messages(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages) +void PageClient::did_get_js_console_messages(i32 start_index, ReadonlySpan console_output) { - client().async_did_get_styled_js_console_messages(m_id, start_index, message_types, messages); -} - -void PageClient::did_get_unstyled_js_console_messages(i32 start_index, ReadonlySpan console_output) -{ - client().async_did_get_unstyled_js_console_messages(m_id, start_index, console_output); + client().async_did_get_js_console_messages(m_id, start_index, console_output); } static void gather_style_sheets(Vector& results, Web::CSS::CSSStyleSheet& sheet) diff --git a/Services/WebContent/PageClient.h b/Services/WebContent/PageClient.h index decad41550f..bf07c14f2be 100644 --- a/Services/WebContent/PageClient.h +++ b/Services/WebContent/PageClient.h @@ -89,8 +89,7 @@ public: void js_console_request_messages(i32 start_index); void did_output_js_console_message(i32 message_index); void console_peer_did_misbehave(char const* reason); - void did_get_styled_js_console_messages(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages); - void did_get_unstyled_js_console_messages(i32 start_index, ReadonlySpan console_output); + void did_get_js_console_messages(i32 start_index, ReadonlySpan console_output); Vector list_style_sheets() const; diff --git a/Services/WebContent/WebContentClient.ipc b/Services/WebContent/WebContentClient.ipc index 09963a08c65..e1bfacc844c 100644 --- a/Services/WebContent/WebContentClient.ipc +++ b/Services/WebContent/WebContentClient.ipc @@ -98,8 +98,7 @@ endpoint WebContentClient did_execute_js_console_input(u64 page_id, JsonValue result) =| did_output_js_console_message(u64 page_id, i32 message_index) =| - did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) =| - did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector console_output) =| + did_get_js_console_messages(u64 page_id, i32 start_index, Vector console_output) =| did_finish_test(u64 page_id, String text) =| did_set_test_timeout(u64 page_id, double milliseconds) =|