Explorar o código

LibWebView+WebContent: Rename DOM/a11y tree IPC response methods

Rename them from "did_get_*" to "did_inspect_*", to correspond to the
request methods "inspect_dom_tree" and "inspect_accessibility_tree". No
functional change, but this makes it a bit easier to stare at IPC files
side-by-side and know which response method corresponds to a request
method at a quick glance.
Timothy Flynn hai 1 ano
pai
achega
4c3bff264e

+ 2 - 2
Userland/Libraries/LibWebView/WebContentClient.cpp

@@ -181,13 +181,13 @@ void WebContentClient::did_get_source(AK::URL const& url, ByteString const& sour
         m_view.on_received_source(url, source);
 }
 
-void WebContentClient::did_get_dom_tree(ByteString const& dom_tree)
+void WebContentClient::did_inspect_dom_tree(ByteString const& dom_tree)
 {
     if (m_view.on_received_dom_tree)
         m_view.on_received_dom_tree(dom_tree);
 }
 
-void WebContentClient::did_get_accessibility_tree(ByteString const& accessibility_tree)
+void WebContentClient::did_inspect_accessibility_tree(ByteString const& accessibility_tree)
 {
     if (m_view.on_received_accessibility_tree)
         m_view.on_received_accessibility_tree(accessibility_tree);

+ 2 - 2
Userland/Libraries/LibWebView/WebContentClient.h

@@ -52,8 +52,8 @@ private:
     virtual void did_request_image_context_menu(Gfx::IntPoint, AK::URL const&, ByteString const&, unsigned, Gfx::ShareableBitmap const&) override;
     virtual void did_request_media_context_menu(Gfx::IntPoint, ByteString const&, unsigned, Web::Page::MediaContextMenu const&) override;
     virtual void did_get_source(AK::URL const&, ByteString const&) override;
-    virtual void did_get_dom_tree(ByteString const&) override;
-    virtual void did_get_accessibility_tree(ByteString const&) override;
+    virtual void did_inspect_dom_tree(ByteString const&) override;
+    virtual void did_inspect_accessibility_tree(ByteString const&) override;
     virtual void did_output_js_console_message(i32 message_index) override;
     virtual void did_get_js_console_messages(i32 start_index, Vector<ByteString> const& message_types, Vector<ByteString> const& messages) override;
     virtual void did_change_favicon(Gfx::ShareableBitmap const&) override;

+ 8 - 8
Userland/Services/WebContent/ConnectionFromClient.cpp

@@ -470,7 +470,7 @@ void ConnectionFromClient::get_source()
 void ConnectionFromClient::inspect_dom_tree()
 {
     if (auto* doc = page().page().top_level_browsing_context().active_document()) {
-        async_did_get_dom_tree(doc->dump_dom_tree_as_json().to_byte_string());
+        async_did_inspect_dom_tree(doc->dump_dom_tree_as_json().to_byte_string());
     }
 }
 
@@ -605,6 +605,13 @@ Messages::WebContentServer::InspectDomNodeResponse ConnectionFromClient::inspect
     return { false, "", "", "", "", "" };
 }
 
+void ConnectionFromClient::inspect_accessibility_tree()
+{
+    if (auto* doc = page().page().top_level_browsing_context().active_document()) {
+        async_did_inspect_accessibility_tree(doc->dump_accessibility_tree_as_json().to_byte_string());
+    }
+}
+
 Messages::WebContentServer::GetHoveredNodeIdResponse ConnectionFromClient::get_hovered_node_id()
 {
     if (auto* document = page().page().top_level_browsing_context().active_document()) {
@@ -1045,13 +1052,6 @@ void ConnectionFromClient::set_user_style(String const& source)
     page().page().set_user_style(source);
 }
 
-void ConnectionFromClient::inspect_accessibility_tree()
-{
-    if (auto* doc = page().page().top_level_browsing_context().active_document()) {
-        async_did_get_accessibility_tree(doc->dump_accessibility_tree_as_json().to_byte_string());
-    }
-}
-
 void ConnectionFromClient::enable_inspector_prototype()
 {
     Web::HTML::Window::set_inspector_object_exposed(true);

+ 2 - 2
Userland/Services/WebContent/WebContentClient.ipc

@@ -40,8 +40,8 @@ endpoint WebContentClient
     did_request_accept_dialog() =|
     did_request_dismiss_dialog() =|
     did_get_source(URL url, ByteString source) =|
-    did_get_dom_tree(ByteString dom_tree) =|
-    did_get_accessibility_tree(ByteString accessibility_tree) =|
+    did_inspect_dom_tree(ByteString dom_tree) =|
+    did_inspect_accessibility_tree(ByteString accessibility_tree) =|
     did_change_favicon(Gfx::ShareableBitmap favicon) =|
     did_request_all_cookies(URL url) => (Vector<Web::Cookie::Cookie> cookies)
     did_request_named_cookie(URL url, ByteString name) => (Optional<Web::Cookie::Cookie> cookie)