From bdb31b029abcf73b5876a81845235a708da01aec Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 7 Mar 2025 09:26:36 -0500 Subject: [PATCH] LibDevTools+LibWebView: Implement requests to edit DOM node tags --- Libraries/LibDevTools/Actors/WalkerActor.cpp | 35 ++++++++++++++++++++ Libraries/LibDevTools/DevToolsDelegate.h | 1 + Libraries/LibWebView/Application.cpp | 7 ++++ Libraries/LibWebView/Application.h | 1 + 4 files changed, 44 insertions(+) diff --git a/Libraries/LibDevTools/Actors/WalkerActor.cpp b/Libraries/LibDevTools/Actors/WalkerActor.cpp index dcf3f294839..11eceec2334 100644 --- a/Libraries/LibDevTools/Actors/WalkerActor.cpp +++ b/Libraries/LibDevTools/Actors/WalkerActor.cpp @@ -73,6 +73,41 @@ void WalkerActor::handle_message(StringView type, JsonObject const& message) return; } + if (type == "editTagName"sv) { + auto node = message.get_string("node"sv); + if (!node.has_value()) { + send_missing_parameter_error("node"sv); + return; + } + + auto tag_name = message.get_string("tagName"sv); + if (!tag_name.has_value()) { + send_missing_parameter_error("tagName"sv); + return; + } + + if (auto dom_node = WalkerActor::dom_node_for(*this, *node); dom_node.has_value()) { + auto block_token = block_responses(); + + devtools().delegate().set_dom_node_tag( + dom_node->tab->description(), dom_node->identifier.id, tag_name.release_value(), + [weak_self = make_weak_ptr(), block_token = move(block_token)](ErrorOr node_id) mutable { + if (node_id.is_error()) { + dbgln_if(DEVTOOLS_DEBUG, "Unable to edit DOM node: {}", node_id.error()); + return; + } + + if (auto self = weak_self.strong_ref()) { + JsonObject message; + message.set("from"sv, self->name()); + self->send_message(move(message), move(block_token)); + } + }); + } + + return; + } + if (type == "getLayoutInspector"sv) { if (!m_layout_inspector) m_layout_inspector = devtools().register_actor(); diff --git a/Libraries/LibDevTools/DevToolsDelegate.h b/Libraries/LibDevTools/DevToolsDelegate.h index d31ca0cdda2..b04a79f3134 100644 --- a/Libraries/LibDevTools/DevToolsDelegate.h +++ b/Libraries/LibDevTools/DevToolsDelegate.h @@ -43,6 +43,7 @@ public: using OnDOMNodeEditComplete = Function)>; virtual void set_dom_node_text(TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const { } + virtual void set_dom_node_tag(TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const { } virtual void add_dom_node_attributes(TabDescription const&, Web::UniqueNodeID, Vector, OnDOMNodeEditComplete) const { } virtual void replace_dom_node_attribute(TabDescription const&, Web::UniqueNodeID, String, Vector, OnDOMNodeEditComplete) const { } diff --git a/Libraries/LibWebView/Application.cpp b/Libraries/LibWebView/Application.cpp index c10fd6aa0cb..a08cb18eb86 100644 --- a/Libraries/LibWebView/Application.cpp +++ b/Libraries/LibWebView/Application.cpp @@ -465,6 +465,13 @@ void Application::set_dom_node_text(DevTools::TabDescription const& description, }); } +void Application::set_dom_node_tag(DevTools::TabDescription const& description, Web::UniqueNodeID node_id, String value, OnDOMNodeEditComplete on_complete) const +{ + edit_dom_node(description, move(on_complete), [&](auto& view) { + view.set_dom_node_tag(node_id, move(value)); + }); +} + void Application::add_dom_node_attributes(DevTools::TabDescription const& description, Web::UniqueNodeID node_id, Vector replacement_attributes, OnDOMNodeEditComplete on_complete) const { edit_dom_node(description, move(on_complete), [&](auto& view) { diff --git a/Libraries/LibWebView/Application.h b/Libraries/LibWebView/Application.h index acaa3aa2f14..610c748e099 100644 --- a/Libraries/LibWebView/Application.h +++ b/Libraries/LibWebView/Application.h @@ -99,6 +99,7 @@ private: virtual void listen_for_dom_mutations(DevTools::TabDescription const&, OnDOMMutationReceived) const override; virtual void stop_listening_for_dom_mutations(DevTools::TabDescription const&) const override; virtual void set_dom_node_text(DevTools::TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const override; + virtual void set_dom_node_tag(DevTools::TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const override; virtual void add_dom_node_attributes(DevTools::TabDescription const&, Web::UniqueNodeID, Vector, OnDOMNodeEditComplete) const override; virtual void replace_dom_node_attribute(DevTools::TabDescription const&, Web::UniqueNodeID, String, Vector, OnDOMNodeEditComplete) const override; virtual void evaluate_javascript(DevTools::TabDescription const&, String, OnScriptEvaluationComplete) const override;