Sfoglia il codice sorgente

LibWeb+LibWebView+WebContent: Add an Inspector IPC to add DOM attributes

Timothy Flynn 1 anno fa
parent
commit
2cdad0f068

+ 5 - 0
Userland/Libraries/LibWeb/Internals/Inspector.cpp

@@ -56,6 +56,11 @@ void Inspector::set_dom_node_tag(i32 node_id, String const& tag)
     global_object().browsing_context()->page().client().inspector_did_set_dom_node_tag(node_id, tag);
 }
 
+void Inspector::add_dom_node_attributes(i32 node_id, JS::NonnullGCPtr<DOM::NamedNodeMap> attributes)
+{
+    global_object().browsing_context()->page().client().inspector_did_add_dom_node_attributes(node_id, attributes);
+}
+
 void Inspector::replace_dom_node_attribute(i32 node_id, String const& name, JS::NonnullGCPtr<DOM::NamedNodeMap> replacement_attributes)
 {
     global_object().browsing_context()->page().client().inspector_did_replace_dom_node_attribute(node_id, name, replacement_attributes);

+ 1 - 0
Userland/Libraries/LibWeb/Internals/Inspector.h

@@ -23,6 +23,7 @@ public:
 
     void set_dom_node_text(i32 node_id, String const& text);
     void set_dom_node_tag(i32 node_id, String const& tag);
+    void add_dom_node_attributes(i32 node_id, JS::NonnullGCPtr<DOM::NamedNodeMap> attributes);
     void replace_dom_node_attribute(i32 node_id, String const& name, JS::NonnullGCPtr<DOM::NamedNodeMap> replacement_attributes);
 
     void request_dom_tree_context_menu(i32 node_id, i32 client_x, i32 client_y, String const& type, Optional<String> const& tag_or_attribute_name);

+ 1 - 0
Userland/Libraries/LibWeb/Internals/Inspector.idl

@@ -7,6 +7,7 @@
 
     undefined setDOMNodeText(long nodeID, DOMString text);
     undefined setDOMNodeTag(long nodeID, DOMString tag);
+    undefined addDOMNodeAttributes(long nodeID, NamedNodeMap attributes);
     undefined replaceDOMNodeAttribute(long nodeID, DOMString name, NamedNodeMap replacementAttributes);
 
     undefined requestDOMTreeContextMenu(long nodeID, long clientX, long clientY, DOMString type, DOMString? tagOrAttributeName);

+ 1 - 0
Userland/Libraries/LibWeb/Page/Page.h

@@ -274,6 +274,7 @@ public:
     virtual void inspector_did_select_dom_node([[maybe_unused]] i32 node_id, [[maybe_unused]] Optional<CSS::Selector::PseudoElement> const& pseudo_element) { }
     virtual void inspector_did_set_dom_node_text([[maybe_unused]] i32 node_id, [[maybe_unused]] String const& text) { }
     virtual void inspector_did_set_dom_node_tag([[maybe_unused]] i32 node_id, [[maybe_unused]] String const& tag) { }
+    virtual void inspector_did_add_dom_node_attributes([[maybe_unused]] i32 node_id, [[maybe_unused]] JS::NonnullGCPtr<DOM::NamedNodeMap> attributes) { }
     virtual void inspector_did_replace_dom_node_attribute([[maybe_unused]] i32 node_id, [[maybe_unused]] String const& name, [[maybe_unused]] JS::NonnullGCPtr<DOM::NamedNodeMap> replacement_attributes) { }
     virtual void inspector_did_request_dom_tree_context_menu([[maybe_unused]] i32 node_id, [[maybe_unused]] CSSPixelPoint position, [[maybe_unused]] String const& type, [[maybe_unused]] Optional<String> const& tag_or_attribute_name) { }
     virtual void inspector_did_execute_console_script([[maybe_unused]] String const& script) { }

+ 1 - 0
Userland/Libraries/LibWebView/ViewImplementation.h

@@ -155,6 +155,7 @@ public:
     Function<void(i32, Optional<Web::CSS::Selector::PseudoElement> const&)> on_inspector_selected_dom_node;
     Function<void(i32, String const&)> on_inspector_set_dom_node_text;
     Function<void(i32, String const&)> on_inspector_set_dom_node_tag;
+    Function<void(i32, Vector<Attribute> const&)> on_inspector_added_dom_node_attributes;
     Function<void(i32, String const&, Vector<Attribute> const&)> on_inspector_replaced_dom_node_attribute;
     Function<void(i32, Gfx::IntPoint, String const&, Optional<String> const&)> on_inspector_requested_dom_tree_context_menu;
     Function<void(String const&)> on_inspector_executed_console_script;

+ 6 - 0
Userland/Libraries/LibWebView/WebContentClient.cpp

@@ -426,6 +426,12 @@ void WebContentClient::inspector_did_set_dom_node_tag(i32 node_id, String const&
         m_view.on_inspector_set_dom_node_tag(node_id, tag);
 }
 
+void WebContentClient::inspector_did_add_dom_node_attributes(i32 node_id, Vector<Attribute> const& attributes)
+{
+    if (m_view.on_inspector_added_dom_node_attributes)
+        m_view.on_inspector_added_dom_node_attributes(node_id, attributes);
+}
+
 void WebContentClient::inspector_did_replace_dom_node_attribute(i32 node_id, String const& name, Vector<Attribute> const& replacement_attributes)
 {
     if (m_view.on_inspector_replaced_dom_node_attribute)

+ 1 - 0
Userland/Libraries/LibWebView/WebContentClient.h

@@ -90,6 +90,7 @@ private:
     virtual void inspector_did_select_dom_node(i32 node_id, Optional<Web::CSS::Selector::PseudoElement> const& pseudo_element) override;
     virtual void inspector_did_set_dom_node_text(i32 node_id, String const& text) override;
     virtual void inspector_did_set_dom_node_tag(i32 node_id, String const& tag) override;
+    virtual void inspector_did_add_dom_node_attributes(i32 node_id, Vector<Attribute> const& attributes) override;
     virtual void inspector_did_replace_dom_node_attribute(i32 node_id, String const& name, Vector<Attribute> const& replacement_attributes) override;
     virtual void inspector_did_request_dom_tree_context_menu(i32 node_id, Gfx::IntPoint position, String const& type, Optional<String> const& tag_or_attribute_name) override;
     virtual void inspector_did_execute_console_script(String const& script) override;

+ 15 - 5
Userland/Services/WebContent/PageClient.cpp

@@ -533,19 +533,29 @@ void PageClient::inspector_did_set_dom_node_tag(i32 node_id, String const& tag)
     client().async_inspector_did_set_dom_node_tag(node_id, tag);
 }
 
-void PageClient::inspector_did_replace_dom_node_attribute(i32 node_id, String const& name, JS::NonnullGCPtr<Web::DOM::NamedNodeMap> replacement_attributes)
+static Vector<WebView::Attribute> named_node_map_to_vector(JS::NonnullGCPtr<Web::DOM::NamedNodeMap> map)
 {
     Vector<WebView::Attribute> attributes;
-    attributes.ensure_capacity(replacement_attributes->length());
+    attributes.ensure_capacity(map->length());
 
-    for (size_t i = 0; i < replacement_attributes->length(); ++i) {
-        auto const* attribute = replacement_attributes->item(i);
+    for (size_t i = 0; i < map->length(); ++i) {
+        auto const* attribute = map->item(i);
         VERIFY(attribute);
 
         attributes.empend(attribute->name().to_string(), attribute->value());
     }
 
-    client().async_inspector_did_replace_dom_node_attribute(node_id, name, move(attributes));
+    return attributes;
+}
+
+void PageClient::inspector_did_add_dom_node_attributes(i32 node_id, JS::NonnullGCPtr<Web::DOM::NamedNodeMap> attributes)
+{
+    client().async_inspector_did_add_dom_node_attributes(node_id, named_node_map_to_vector(attributes));
+}
+
+void PageClient::inspector_did_replace_dom_node_attribute(i32 node_id, String const& name, JS::NonnullGCPtr<Web::DOM::NamedNodeMap> replacement_attributes)
+{
+    client().async_inspector_did_replace_dom_node_attribute(node_id, name, named_node_map_to_vector(replacement_attributes));
 }
 
 void PageClient::inspector_did_request_dom_tree_context_menu(i32 node_id, Web::CSSPixelPoint position, String const& type, Optional<String> const& tag_or_attribute_name)

+ 1 - 0
Userland/Services/WebContent/PageClient.h

@@ -125,6 +125,7 @@ private:
     virtual void inspector_did_select_dom_node(i32 node_id, Optional<Web::CSS::Selector::PseudoElement> const& pseudo_element) override;
     virtual void inspector_did_set_dom_node_text(i32 node_id, String const& text) override;
     virtual void inspector_did_set_dom_node_tag(i32 node_id, String const& tag) override;
+    virtual void inspector_did_add_dom_node_attributes(i32 node_id, JS::NonnullGCPtr<Web::DOM::NamedNodeMap> attributes) override;
     virtual void inspector_did_replace_dom_node_attribute(i32 node_id, String const& name, JS::NonnullGCPtr<Web::DOM::NamedNodeMap> replacement_attributes) override;
     virtual void inspector_did_request_dom_tree_context_menu(i32 node_id, Web::CSSPixelPoint position, String const& type, Optional<String> const& tag_or_attribute_name) override;
     virtual void inspector_did_execute_console_script(String const& script) override;

+ 1 - 0
Userland/Services/WebContent/WebContentClient.ipc

@@ -75,6 +75,7 @@ endpoint WebContentClient
     inspector_did_select_dom_node(i32 node_id, Optional<Web::CSS::Selector::PseudoElement> pseudo_element) =|
     inspector_did_set_dom_node_text(i32 node_id, String text) =|
     inspector_did_set_dom_node_tag(i32 node_id, String tag) =|
+    inspector_did_add_dom_node_attributes(i32 node_id, Vector<WebView::Attribute> attributes) =|
     inspector_did_replace_dom_node_attribute(i32 node_id, String name, Vector<WebView::Attribute> replacement_attributes) =|
     inspector_did_request_dom_tree_context_menu(i32 node_id, Gfx::IntPoint position, String type, Optional<String> tag_or_attribute_name) =|
     inspector_did_execute_console_script(String script) =|