diff --git a/Ladybird/Qt/Tab.cpp b/Ladybird/Qt/Tab.cpp index cacbb10492..d430126ed5 100644 --- a/Ladybird/Qt/Tab.cpp +++ b/Ladybird/Qt/Tab.cpp @@ -215,7 +215,7 @@ Tab::Tab(BrowserWindow* window, StringView webdriver_content_ipc_path, WebView:: QObject::connect(focus_location_editor_action, &QAction::triggered, this, &Tab::focus_location_editor); - view().on_get_source = [this](auto const& url, auto const& source) { + view().on_received_source = [this](auto const& url, auto const& source) { auto* text_edit = new QPlainTextEdit(this); text_edit->setWindowFlags(Qt::Window); text_edit->setFont(QFontDatabase::systemFont(QFontDatabase::SystemFont::FixedFont)); @@ -266,22 +266,22 @@ Tab::Tab(BrowserWindow* window, StringView webdriver_content_ipc_path, WebView:: return Gfx::IntRect { m_window->x(), m_window->y(), m_window->width(), m_window->height() }; }; - view().on_get_dom_tree = [this](auto& dom_tree) { + view().on_received_dom_tree = [this](auto& dom_tree) { if (m_inspector_widget) m_inspector_widget->set_dom_json(dom_tree); }; - view().on_get_accessibility_tree = [this](auto& accessibility_tree) { + view().on_received_accessibility_tree = [this](auto& accessibility_tree) { if (m_inspector_widget) m_inspector_widget->set_accessibility_json(accessibility_tree); }; - view().on_js_console_new_message = [this](auto message_index) { + view().on_received_console_message = [this](auto message_index) { if (m_console_widget) m_console_widget->notify_about_new_console_message(message_index); }; - view().on_get_js_console_messages = [this](auto start_index, auto& message_types, auto& messages) { + view().on_received_console_messages = [this](auto start_index, auto& message_types, auto& messages) { if (m_console_widget) m_console_widget->handle_console_messages(start_index, message_types, messages); }; diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index ae44f8ffb4..2d7edcb9f2 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -565,30 +565,30 @@ Tab::Tab(BrowserWindow& window) m_dialog->done(GUI::Dialog::ExecResult::Cancel); }; - view().on_get_source = [this](auto& url, auto& source) { + view().on_received_source = [this](auto& url, auto& source) { view_source(url, source); }; - view().on_get_dom_tree = [this](auto& dom_tree) { + view().on_received_dom_tree = [this](auto& dom_tree) { if (m_dom_inspector_widget) m_dom_inspector_widget->set_dom_json(dom_tree); }; - view().on_get_dom_node_properties = [this](auto node_id, auto& specified, auto& computed, auto& custom_properties, auto& node_box_sizing, auto& aria_properties_state) { + view().on_received_dom_node_properties = [this](auto node_id, auto& specified, auto& computed, auto& custom_properties, auto& node_box_sizing, auto& aria_properties_state) { m_dom_inspector_widget->set_dom_node_properties_json({ node_id }, specified, computed, custom_properties, node_box_sizing, aria_properties_state); }; - view().on_get_accessibility_tree = [this](auto& accessibility_tree) { + view().on_received_accessibility_tree = [this](auto& accessibility_tree) { if (m_dom_inspector_widget) m_dom_inspector_widget->set_accessibility_json(accessibility_tree); }; - view().on_js_console_new_message = [this](auto message_index) { + view().on_received_console_message = [this](auto message_index) { if (m_console_widget) m_console_widget->notify_about_new_console_message(message_index); }; - view().on_get_js_console_messages = [this](auto start_index, auto& message_types, auto& messages) { + view().on_received_console_messages = [this](auto start_index, auto& message_types, auto& messages) { if (m_console_widget) m_console_widget->handle_console_messages(start_index, message_types, messages); }; diff --git a/Userland/Libraries/LibWebView/ViewImplementation.h b/Userland/Libraries/LibWebView/ViewImplementation.h index f437c6b500..8a21d5c727 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.h +++ b/Userland/Libraries/LibWebView/ViewImplementation.h @@ -127,12 +127,12 @@ public: Function on_request_set_prompt_text; Function on_request_accept_dialog; Function on_request_dismiss_dialog; - Function on_get_source; - Function on_get_dom_tree; - Function on_get_dom_node_properties; - Function on_get_accessibility_tree; - Function on_js_console_new_message; - Function const& message_types, Vector const& messages)> on_get_js_console_messages; + Function on_received_source; + Function on_received_dom_tree; + Function on_received_dom_node_properties; + Function on_received_accessibility_tree; + Function on_received_console_message; + Function const& message_types, Vector const& messages)> on_received_console_messages; Function(AK::URL const& url)> on_get_all_cookies; Function(AK::URL const& url, DeprecatedString const& name)> on_get_named_cookie; Function on_get_cookie; diff --git a/Userland/Libraries/LibWebView/WebContentClient.cpp b/Userland/Libraries/LibWebView/WebContentClient.cpp index e0fef7f524..c5efcb9c49 100644 --- a/Userland/Libraries/LibWebView/WebContentClient.cpp +++ b/Userland/Libraries/LibWebView/WebContentClient.cpp @@ -192,38 +192,38 @@ void WebContentClient::did_request_media_context_menu(Gfx::IntPoint content_posi void WebContentClient::did_get_source(AK::URL const& url, DeprecatedString const& source) { - if (m_view.on_get_source) - m_view.on_get_source(url, source); + if (m_view.on_received_source) + m_view.on_received_source(url, source); } void WebContentClient::did_get_dom_tree(DeprecatedString const& dom_tree) { - if (m_view.on_get_dom_tree) - m_view.on_get_dom_tree(dom_tree); + if (m_view.on_received_dom_tree) + m_view.on_received_dom_tree(dom_tree); } void WebContentClient::did_get_dom_node_properties(i32 node_id, DeprecatedString const& computed_style, DeprecatedString const& resolved_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing, DeprecatedString const& aria_properties_state) { - if (m_view.on_get_dom_node_properties) - m_view.on_get_dom_node_properties(node_id, computed_style, resolved_style, custom_properties, node_box_sizing, aria_properties_state); + if (m_view.on_received_dom_node_properties) + m_view.on_received_dom_node_properties(node_id, computed_style, resolved_style, custom_properties, node_box_sizing, aria_properties_state); } void WebContentClient::did_get_accessibility_tree(DeprecatedString const& accessibility_tree) { - if (m_view.on_get_accessibility_tree) - m_view.on_get_accessibility_tree(accessibility_tree); + if (m_view.on_received_accessibility_tree) + m_view.on_received_accessibility_tree(accessibility_tree); } void WebContentClient::did_output_js_console_message(i32 message_index) { - if (m_view.on_js_console_new_message) - m_view.on_js_console_new_message(message_index); + if (m_view.on_received_console_message) + m_view.on_received_console_message(message_index); } void WebContentClient::did_get_js_console_messages(i32 start_index, Vector const& message_types, Vector const& messages) { - if (m_view.on_get_js_console_messages) - m_view.on_get_js_console_messages(start_index, message_types, messages); + if (m_view.on_received_console_messages) + m_view.on_received_console_messages(start_index, message_types, messages); } void WebContentClient::did_request_alert(String const& message)