diff --git a/Libraries/LibWebView/InspectorClient.cpp b/Libraries/LibWebView/InspectorClient.cpp index 5379fb8918d..2895a8fa3c2 100644 --- a/Libraries/LibWebView/InspectorClient.cpp +++ b/Libraries/LibWebView/InspectorClient.cpp @@ -118,12 +118,12 @@ InspectorClient::InspectorClient(ViewImplementation& content_web_view, ViewImple m_content_web_view.on_insert_clipboard_entry(html, "unspecified"_string, "text/plain"_string); }; - m_content_web_view.on_received_console_message = [this](auto message_index) { - handle_console_message(message_index); + m_content_web_view.on_console_message_available = [this](auto message_index) { + console_message_available(message_index); }; - m_content_web_view.on_received_console_messages = [this](auto start_index, auto const& message_types, auto const& messages) { - handle_console_messages(start_index, message_types, messages); + m_content_web_view.on_received_styled_console_messages = [this](auto start_index, auto const& message_types, auto const& messages) { + console_messages_received(start_index, message_types, messages); }; m_inspector_web_view.enable_inspector_prototype(); @@ -257,8 +257,8 @@ InspectorClient::~InspectorClient() { m_content_web_view.on_finshed_editing_dom_node = nullptr; m_content_web_view.on_received_accessibility_tree = nullptr; - m_content_web_view.on_received_console_message = nullptr; - m_content_web_view.on_received_console_messages = nullptr; + m_content_web_view.on_console_message_available = nullptr; + m_content_web_view.on_received_styled_console_messages = nullptr; m_content_web_view.on_received_dom_node_html = nullptr; m_content_web_view.on_received_dom_node_properties = nullptr; m_content_web_view.on_received_dom_tree = nullptr; @@ -700,7 +700,7 @@ void InspectorClient::request_console_messages() m_waiting_for_messages = true; } -void InspectorClient::handle_console_message(i32 message_index) +void InspectorClient::console_message_available(i32 message_index) { if (message_index <= m_highest_received_message_index) { dbgln("Notified about console message we already have"); @@ -717,7 +717,7 @@ void InspectorClient::handle_console_message(i32 message_index) request_console_messages(); } -void InspectorClient::handle_console_messages(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages) +void InspectorClient::console_messages_received(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages) { auto end_index = start_index + static_cast(message_types.size()) - 1; if (end_index <= m_highest_received_message_index) { diff --git a/Libraries/LibWebView/InspectorClient.h b/Libraries/LibWebView/InspectorClient.h index 4e28548eda2..2216bacd743 100644 --- a/Libraries/LibWebView/InspectorClient.h +++ b/Libraries/LibWebView/InspectorClient.h @@ -57,8 +57,8 @@ private: void load_cookies(); void request_console_messages(); - void handle_console_message(i32 message_index); - void handle_console_messages(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages); + void console_message_available(i32 message_index); + void console_messages_received(i32 start_index, ReadonlySpan message_types, ReadonlySpan messages); void append_console_source(StringView); void append_console_message(StringView); diff --git a/Libraries/LibWebView/ViewImplementation.h b/Libraries/LibWebView/ViewImplementation.h index 875c6f1d347..831189894c2 100644 --- a/Libraries/LibWebView/ViewImplementation.h +++ b/Libraries/LibWebView/ViewImplementation.h @@ -216,8 +216,8 @@ public: Function const& node_id)> on_finshed_editing_dom_node; Function on_received_dom_node_html; Function on_received_js_console_result; - Function on_received_console_message; - Function const& message_types, Vector const& messages)> on_received_console_messages; + Function on_console_message_available; + Function const& message_types, Vector const& messages)> on_received_styled_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 9f7fdd71071..0ae57f351ac 100644 --- a/Libraries/LibWebView/WebContentClient.cpp +++ b/Libraries/LibWebView/WebContentClient.cpp @@ -372,16 +372,16 @@ void WebContentClient::did_execute_js_console_input(u64 page_id, JsonValue const void WebContentClient::did_output_js_console_message(u64 page_id, i32 message_index) { if (auto view = view_for_page_id(page_id); view.has_value()) { - if (view->on_received_console_message) - view->on_received_console_message(message_index); + if (view->on_console_message_available) + view->on_console_message_available(message_index); } } -void WebContentClient::did_get_js_console_messages(u64 page_id, i32 start_index, Vector const& message_types, Vector const& messages) +void WebContentClient::did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector const& message_types, Vector const& messages) { if (auto view = view_for_page_id(page_id); view.has_value()) { - if (view->on_received_console_messages) - view->on_received_console_messages(start_index, message_types, messages); + if (view->on_received_styled_console_messages) + view->on_received_styled_console_messages(start_index, message_types, messages); } } diff --git a/Libraries/LibWebView/WebContentClient.h b/Libraries/LibWebView/WebContentClient.h index 22e64927e22..5f8266ff241 100644 --- a/Libraries/LibWebView/WebContentClient.h +++ b/Libraries/LibWebView/WebContentClient.h @@ -81,7 +81,7 @@ private: virtual void did_get_internal_page_info(u64 page_id, PageInfoType, String const&) override; virtual void did_execute_js_console_input(u64 page_id, JsonValue const&) override; virtual void did_output_js_console_message(u64 page_id, i32 message_index) override; - virtual void did_get_js_console_messages(u64 page_id, i32 start_index, Vector const& message_types, Vector const& messages) override; + virtual void did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector const& message_types, Vector const& messages) override; virtual void did_change_favicon(u64 page_id, Gfx::ShareableBitmap const&) override; virtual void did_request_alert(u64 page_id, String const&) override; virtual void did_request_confirm(u64 page_id, String const&) override; diff --git a/Services/WebContent/InspectorConsoleClient.cpp b/Services/WebContent/InspectorConsoleClient.cpp index 6ac4878c33e..85f45fab295 100644 --- a/Services/WebContent/InspectorConsoleClient.cpp +++ b/Services/WebContent/InspectorConsoleClient.cpp @@ -110,7 +110,7 @@ void InspectorConsoleClient::send_messages(i32 start_index) messages.append(message.data); } - m_client->did_get_js_console_messages(start_index, move(message_types), move(messages)); + m_client->did_get_styled_js_console_messages(start_index, move(message_types), move(messages)); } // 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 b3e0d3b1a94..d9cfe7a0b89 100644 --- a/Services/WebContent/PageClient.cpp +++ b/Services/WebContent/PageClient.cpp @@ -805,9 +805,9 @@ void PageClient::console_peer_did_misbehave(char const* reason) client().did_misbehave(reason); } -void PageClient::did_get_js_console_messages(i32 start_index, Vector message_types, Vector messages) +void PageClient::did_get_styled_js_console_messages(i32 start_index, Vector message_types, Vector messages) { - client().async_did_get_js_console_messages(m_id, start_index, move(message_types), move(messages)); + client().async_did_get_styled_js_console_messages(m_id, start_index, move(message_types), move(messages)); } static void gather_style_sheets(Vector& results, Web::CSS::CSSStyleSheet& sheet) diff --git a/Services/WebContent/PageClient.h b/Services/WebContent/PageClient.h index b028f5f12c4..c099b940242 100644 --- a/Services/WebContent/PageClient.h +++ b/Services/WebContent/PageClient.h @@ -90,7 +90,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_js_console_messages(i32 start_index, Vector message_types, Vector messages); + void did_get_styled_js_console_messages(i32 start_index, Vector message_types, Vector messages); Vector list_style_sheets() const; diff --git a/Services/WebContent/WebContentClient.ipc b/Services/WebContent/WebContentClient.ipc index cab39941070..dd200db4c05 100644 --- a/Services/WebContent/WebContentClient.ipc +++ b/Services/WebContent/WebContentClient.ipc @@ -94,7 +94,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_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) =| + did_get_styled_js_console_messages(u64 page_id, i32 start_index, Vector message_types, Vector messages) =| did_finish_text_test(u64 page_id, String text) =| did_set_test_timeout(u64 page_id, double milliseconds) =|