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.
This commit is contained in:
Timothy Flynn 2025-03-25 10:11:17 -04:00
parent b59c1fbf73
commit 2aeed210d9
8 changed files with 12 additions and 29 deletions

View file

@ -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

View file

@ -212,8 +212,7 @@ public:
Function<void(Web::CSS::StyleSheetIdentifier const&, URL::URL const&, String const&)> on_received_style_sheet_source;
Function<void(JsonValue)> on_received_js_console_result;
Function<void(i32 message_id)> on_console_message_available;
Function<void(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages)> on_received_styled_console_messages;
Function<void(i32 start_index, Vector<ConsoleOutput>)> on_received_unstyled_console_messages;
Function<void(i32 start_index, Vector<ConsoleOutput>)> on_received_console_messages;
Function<void(i32 count_waiting)> on_resource_status_change;
Function<void()> on_restore_window;
Function<void(Gfx::IntPoint)> on_reposition_window;

View file

@ -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<String> message_types, Vector<String> messages)
void WebContentClient::did_get_js_console_messages(u64 page_id, i32 start_index, Vector<ConsoleOutput> 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<ConsoleOutput> 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));
}
}

View file

@ -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<String> message_types, Vector<String> messages) override;
virtual void did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector<ConsoleOutput>) override;
virtual void did_get_js_console_messages(u64 page_id, i32 start_index, Vector<ConsoleOutput>) 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;

View file

@ -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

View file

@ -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<String> message_types, ReadonlySpan<String> messages)
void PageClient::did_get_js_console_messages(i32 start_index, ReadonlySpan<WebView::ConsoleOutput> 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<WebView::ConsoleOutput> 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<Web::CSS::StyleSheetIdentifier>& results, Web::CSS::CSSStyleSheet& sheet)

View file

@ -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<String> message_types, ReadonlySpan<String> messages);
void did_get_unstyled_js_console_messages(i32 start_index, ReadonlySpan<WebView::ConsoleOutput> console_output);
void did_get_js_console_messages(i32 start_index, ReadonlySpan<WebView::ConsoleOutput> console_output);
Vector<Web::CSS::StyleSheetIdentifier> list_style_sheets() const;

View file

@ -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<String> message_types, Vector<String> messages) =|
did_get_unstyled_js_console_messages(u64 page_id, i32 start_index, Vector<WebView::ConsoleOutput> console_output) =|
did_get_js_console_messages(u64 page_id, i32 start_index, Vector<WebView::ConsoleOutput> console_output) =|
did_finish_test(u64 page_id, String text) =|
did_set_test_timeout(u64 page_id, double milliseconds) =|