diff --git a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn index 54def908ec..3046bb980c 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn @@ -116,6 +116,7 @@ shared_library("LibWebView") { "//Userland/Libraries/LibWeb", ] sources = [ + "Attribute.cpp", "CookieJar.cpp", "Database.cpp", "History.cpp", diff --git a/Userland/Libraries/LibWebView/Attribute.cpp b/Userland/Libraries/LibWebView/Attribute.cpp new file mode 100644 index 0000000000..043e78dce3 --- /dev/null +++ b/Userland/Libraries/LibWebView/Attribute.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2023, Tim Flynn + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +template<> +ErrorOr IPC::encode(Encoder& encoder, WebView::Attribute const& attribute) +{ + TRY(encoder.encode(attribute.name)); + TRY(encoder.encode(attribute.value)); + return {}; +} + +template<> +ErrorOr IPC::decode(Decoder& decoder) +{ + auto name = TRY(decoder.decode()); + auto value = TRY(decoder.decode()); + + return WebView::Attribute { move(name), move(value) }; +} diff --git a/Userland/Libraries/LibWebView/Attribute.h b/Userland/Libraries/LibWebView/Attribute.h new file mode 100644 index 0000000000..f28e4262c0 --- /dev/null +++ b/Userland/Libraries/LibWebView/Attribute.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2023, Tim Flynn + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +namespace WebView { + +struct Attribute { + String name; + String value; +}; + +} + +namespace IPC { + +template<> +ErrorOr encode(Encoder&, WebView::Attribute const&); + +template<> +ErrorOr decode(Decoder&); + +} diff --git a/Userland/Libraries/LibWebView/CMakeLists.txt b/Userland/Libraries/LibWebView/CMakeLists.txt index 652e1b8205..896dcc8e39 100644 --- a/Userland/Libraries/LibWebView/CMakeLists.txt +++ b/Userland/Libraries/LibWebView/CMakeLists.txt @@ -1,6 +1,7 @@ include(${SerenityOS_SOURCE_DIR}/Meta/CMake/public_suffix.cmake) set(SOURCES + Attribute.cpp CookieJar.cpp Database.cpp History.cpp diff --git a/Userland/Libraries/LibWebView/Forward.h b/Userland/Libraries/LibWebView/Forward.h index 48ada150ba..b648b9be36 100644 --- a/Userland/Libraries/LibWebView/Forward.h +++ b/Userland/Libraries/LibWebView/Forward.h @@ -18,6 +18,7 @@ class OutOfProcessWebView; class ViewImplementation; class WebContentClient; +struct Attribute; struct CookieStorageKey; struct SearchEngine; diff --git a/Userland/Libraries/LibWebView/ViewImplementation.cpp b/Userland/Libraries/LibWebView/ViewImplementation.cpp index 2df40f3af8..ba78fc8401 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.cpp +++ b/Userland/Libraries/LibWebView/ViewImplementation.cpp @@ -181,6 +181,21 @@ i32 ViewImplementation::get_hovered_node_id() return client().get_hovered_node_id(); } +void ViewImplementation::set_dom_node_text(i32 node_id, String text) +{ + client().async_set_dom_node_text(node_id, move(text)); +} + +Optional ViewImplementation::set_dom_node_tag(i32 node_id, String name) +{ + return client().set_dom_node_tag(node_id, move(name)); +} + +void ViewImplementation::replace_dom_node_attribute(i32 node_id, String name, Vector replacement_attributes) +{ + client().async_replace_dom_node_attribute(node_id, move(name), move(replacement_attributes)); +} + void ViewImplementation::debug_request(DeprecatedString const& request, DeprecatedString const& argument) { client().async_debug_request(request, argument); diff --git a/Userland/Libraries/LibWebView/ViewImplementation.h b/Userland/Libraries/LibWebView/ViewImplementation.h index 6d7a1e0506..5bccd1df55 100644 --- a/Userland/Libraries/LibWebView/ViewImplementation.h +++ b/Userland/Libraries/LibWebView/ViewImplementation.h @@ -63,6 +63,10 @@ public: void clear_inspected_dom_node(); i32 get_hovered_node_id(); + void set_dom_node_text(i32 node_id, String text); + Optional set_dom_node_tag(i32 node_id, String name); + void replace_dom_node_attribute(i32 node_id, String name, Vector replacement_attributes); + void debug_request(DeprecatedString const& request, DeprecatedString const& argument = {}); void run_javascript(StringView); diff --git a/Userland/Services/WebContent/ConnectionFromClient.cpp b/Userland/Services/WebContent/ConnectionFromClient.cpp index daa0fe3b78..81ba66bdfb 100644 --- a/Userland/Services/WebContent/ConnectionFromClient.cpp +++ b/Userland/Services/WebContent/ConnectionFromClient.cpp @@ -22,7 +22,11 @@ #include #include #include +#include +#include #include +#include +#include #include #include #include @@ -37,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -649,6 +654,51 @@ Messages::WebContentServer::GetHoveredNodeIdResponse ConnectionFromClient::get_h return (i32)0; } +void ConnectionFromClient::set_dom_node_text(i32 node_id, String const& text) +{ + auto* dom_node = Web::DOM::Node::from_unique_id(node_id); + if (!dom_node || (!dom_node->is_text() && !dom_node->is_comment())) + return; + + auto& character_data = static_cast(*dom_node); + character_data.set_data(text); +} + +Messages::WebContentServer::SetDomNodeTagResponse ConnectionFromClient::set_dom_node_tag(i32 node_id, String const& name) +{ + auto* dom_node = Web::DOM::Node::from_unique_id(node_id); + if (!dom_node || !dom_node->is_element() || !dom_node->parent()) + return OptionalNone {}; + + auto& element = static_cast(*dom_node); + auto new_element = Web::DOM::create_element(element.document(), name, element.namespace_uri(), element.prefix(), element.is_value()).release_value_but_fixme_should_propagate_errors(); + + element.for_each_attribute([&](auto const& attribute) { + new_element->set_attribute_value(attribute.local_name(), attribute.value().to_deprecated_string(), attribute.prefix(), attribute.namespace_uri()); + }); + + while (auto* child_node = element.first_child()) { + MUST(element.remove_child(*child_node)); + MUST(new_element->append_child(*child_node)); + } + + element.parent()->replace_child(*new_element, element).release_value_but_fixme_should_propagate_errors(); + return new_element->unique_id(); +} + +void ConnectionFromClient::replace_dom_node_attribute(i32 node_id, String const& name, Vector const& replacement_attributes) +{ + auto* dom_node = Web::DOM::Node::from_unique_id(node_id); + if (!dom_node || !dom_node->is_element()) + return; + + auto& element = static_cast(*dom_node); + element.remove_attribute(name); + + for (auto const& attribute : replacement_attributes) + element.set_attribute(attribute.name, attribute.value).release_value_but_fixme_should_propagate_errors(); +} + void ConnectionFromClient::initialize_js_console(Badge, Web::DOM::Document& document) { auto& realm = document.realm(); diff --git a/Userland/Services/WebContent/ConnectionFromClient.h b/Userland/Services/WebContent/ConnectionFromClient.h index 769f1d2d7a..af8857ed9f 100644 --- a/Userland/Services/WebContent/ConnectionFromClient.h +++ b/Userland/Services/WebContent/ConnectionFromClient.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -74,6 +75,11 @@ private: virtual Messages::WebContentServer::InspectDomNodeResponse inspect_dom_node(i32 node_id, Optional const& pseudo_element) override; virtual void inspect_accessibility_tree() override; virtual Messages::WebContentServer::GetHoveredNodeIdResponse get_hovered_node_id() override; + + virtual void set_dom_node_text(i32 node_id, String const& text) override; + virtual Messages::WebContentServer::SetDomNodeTagResponse set_dom_node_tag(i32 node_id, String const& name) override; + virtual void replace_dom_node_attribute(i32 node_id, String const& name, Vector const& replacement_attributes) override; + virtual Messages::WebContentServer::DumpLayoutTreeResponse dump_layout_tree() override; virtual Messages::WebContentServer::DumpPaintTreeResponse dump_paint_tree() override; virtual Messages::WebContentServer::DumpTextResponse dump_text() override; diff --git a/Userland/Services/WebContent/WebContentServer.ipc b/Userland/Services/WebContent/WebContentServer.ipc index bee54d22df..a2adb80391 100644 --- a/Userland/Services/WebContent/WebContentServer.ipc +++ b/Userland/Services/WebContent/WebContentServer.ipc @@ -6,6 +6,7 @@ #include #include #include +#include endpoint WebContentServer { @@ -45,6 +46,10 @@ endpoint WebContentServer js_console_input(DeprecatedString js_source) =| js_console_request_messages(i32 start_index) =| + set_dom_node_text(i32 node_id, String text) =| + set_dom_node_tag(i32 node_id, String name) => (Optional node_id) + replace_dom_node_attribute(i32 node_id, String name, Vector replacement_attributes) =| + take_document_screenshot() => (Gfx::ShareableBitmap data) run_javascript(DeprecatedString js_source) =|