mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-29 12:19:54 +00:00
LibDevTools: Support inspecting DOM node box models and computed styles
This commit is contained in:
parent
3f8b65e45c
commit
afb0a0a394
Notes:
github-actions[bot]
2025-02-24 17:06:41 +00:00
Author: https://github.com/trflynn89
Commit: afb0a0a394
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3666
Reviewed-by: https://github.com/AtkinsSJ
6 changed files with 170 additions and 7 deletions
|
@ -36,7 +36,7 @@ void InspectorActor::handle_message(StringView type, JsonObject const& message)
|
||||||
|
|
||||||
if (type == "getPageStyle"sv) {
|
if (type == "getPageStyle"sv) {
|
||||||
if (!m_page_style)
|
if (!m_page_style)
|
||||||
m_page_style = devtools().register_actor<PageStyleActor>();
|
m_page_style = devtools().register_actor<PageStyleActor>(*this);
|
||||||
|
|
||||||
response.set("pageStyle"sv, m_page_style->serialize_style());
|
response.set("pageStyle"sv, m_page_style->serialize_style());
|
||||||
send_message(move(response));
|
send_message(move(response));
|
||||||
|
|
|
@ -5,24 +5,76 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <AK/JsonObject.h>
|
#include <AK/JsonObject.h>
|
||||||
|
#include <AK/JsonValue.h>
|
||||||
|
#include <LibDevTools/Actors/InspectorActor.h>
|
||||||
#include <LibDevTools/Actors/PageStyleActor.h>
|
#include <LibDevTools/Actors/PageStyleActor.h>
|
||||||
|
#include <LibDevTools/Actors/TabActor.h>
|
||||||
|
#include <LibDevTools/Actors/WalkerActor.h>
|
||||||
|
#include <LibDevTools/DevToolsDelegate.h>
|
||||||
|
#include <LibDevTools/DevToolsServer.h>
|
||||||
|
|
||||||
namespace DevTools {
|
namespace DevTools {
|
||||||
|
|
||||||
NonnullRefPtr<PageStyleActor> PageStyleActor::create(DevToolsServer& devtools, String name)
|
NonnullRefPtr<PageStyleActor> PageStyleActor::create(DevToolsServer& devtools, String name, WeakPtr<InspectorActor> inspector)
|
||||||
{
|
{
|
||||||
return adopt_ref(*new PageStyleActor(devtools, move(name)));
|
return adopt_ref(*new PageStyleActor(devtools, move(name), move(inspector)));
|
||||||
}
|
}
|
||||||
|
|
||||||
PageStyleActor::PageStyleActor(DevToolsServer& devtools, String name)
|
PageStyleActor::PageStyleActor(DevToolsServer& devtools, String name, WeakPtr<InspectorActor> inspector)
|
||||||
: Actor(devtools, move(name))
|
: Actor(devtools, move(name))
|
||||||
|
, m_inspector(move(inspector))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
PageStyleActor::~PageStyleActor() = default;
|
PageStyleActor::~PageStyleActor() = default;
|
||||||
|
|
||||||
void PageStyleActor::handle_message(StringView type, JsonObject const&)
|
void PageStyleActor::handle_message(StringView type, JsonObject const& message)
|
||||||
{
|
{
|
||||||
|
JsonObject response;
|
||||||
|
response.set("from"sv, name());
|
||||||
|
|
||||||
|
if (type == "getApplied"sv) {
|
||||||
|
// FIXME: This provides information to the "styles" pane in the inspector tab, which allows toggling and editing
|
||||||
|
// styles live. We do not yet support figuring out the list of styles that apply to a specific node.
|
||||||
|
response.set("entries"sv, JsonArray {});
|
||||||
|
send_message(move(response));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type == "getComputed"sv) {
|
||||||
|
auto node = message.get_string("node"sv);
|
||||||
|
if (!node.has_value()) {
|
||||||
|
send_missing_parameter_error("node"sv);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
inspect_dom_node(*node, [](auto& self, auto const& properties, auto block_token) {
|
||||||
|
self.received_computed_style(properties.computed_style, move(block_token));
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type == "getLayout"sv) {
|
||||||
|
auto node = message.get_string("node"sv);
|
||||||
|
if (!node.has_value()) {
|
||||||
|
send_missing_parameter_error("node"sv);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
inspect_dom_node(*node, [](auto& self, auto const& properties, auto block_token) {
|
||||||
|
self.received_layout(properties.computed_style, properties.node_box_sizing, move(block_token));
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type == "isPositionEditable") {
|
||||||
|
response.set("value"sv, false);
|
||||||
|
send_message(move(response));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
send_unrecognized_packet_type_error(type);
|
send_unrecognized_packet_type_error(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,4 +92,95 @@ JsonValue PageStyleActor::serialize_style() const
|
||||||
return style;
|
return style;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename Callback>
|
||||||
|
void PageStyleActor::inspect_dom_node(StringView node_actor, Callback&& callback)
|
||||||
|
{
|
||||||
|
auto tab = InspectorActor::tab_for(m_inspector);
|
||||||
|
auto walker = InspectorActor::walker_for(m_inspector);
|
||||||
|
if (!tab || !walker)
|
||||||
|
return;
|
||||||
|
|
||||||
|
auto const& dom_node = walker->dom_node(node_actor);
|
||||||
|
if (!dom_node.has_value())
|
||||||
|
return;
|
||||||
|
|
||||||
|
auto block_token = block_responses();
|
||||||
|
|
||||||
|
devtools().delegate().inspect_dom_node(
|
||||||
|
tab->description(), dom_node->id, dom_node->pseudo_element,
|
||||||
|
[weak_self = make_weak_ptr<PageStyleActor>(), block_token = move(block_token), callback = forward<Callback>(callback)](ErrorOr<WebView::ViewImplementation::DOMNodeProperties> properties) mutable {
|
||||||
|
if (properties.is_error()) {
|
||||||
|
dbgln_if(DEVTOOLS_DEBUG, "Unable to inspect DOM node: {}", properties.error());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (auto self = weak_self.strong_ref())
|
||||||
|
callback(*self, properties.value(), move(block_token));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void PageStyleActor::received_layout(JsonObject const& computed_style, JsonObject const& node_box_sizing, BlockToken block_token)
|
||||||
|
{
|
||||||
|
JsonObject message;
|
||||||
|
message.set("from"sv, name());
|
||||||
|
message.set("autoMargins"sv, JsonObject {});
|
||||||
|
|
||||||
|
auto pixel_value = [&](auto const& object, auto key) {
|
||||||
|
return object.get_double_with_precision_loss(key).value_or(0);
|
||||||
|
};
|
||||||
|
auto set_pixel_value_from = [&](auto const& object, auto object_key, auto message_key) {
|
||||||
|
message.set(message_key, MUST(String::formatted("{}px", pixel_value(object, object_key))));
|
||||||
|
};
|
||||||
|
auto set_computed_value_from = [&](auto const& object, auto key) {
|
||||||
|
message.set(key, object.get_string(key).value_or(String {}));
|
||||||
|
};
|
||||||
|
|
||||||
|
message.set("width"sv, pixel_value(node_box_sizing, "content_width"sv));
|
||||||
|
message.set("height"sv, pixel_value(node_box_sizing, "content_height"sv));
|
||||||
|
|
||||||
|
// FIXME: This response should also contain "top", "right", "bottom", and "left", but our box model metrics in
|
||||||
|
// WebContent do not provide this information.
|
||||||
|
|
||||||
|
set_pixel_value_from(node_box_sizing, "border_top"sv, "border-top-width"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "border_right"sv, "border-right-width"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "border_bottom"sv, "border-bottom-width"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "border_left"sv, "border-left-width"sv);
|
||||||
|
|
||||||
|
set_pixel_value_from(node_box_sizing, "margin_top"sv, "margin-top"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "margin_right"sv, "margin-right"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "margin_bottom"sv, "margin-bottom"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "margin_left"sv, "margin-left"sv);
|
||||||
|
|
||||||
|
set_pixel_value_from(node_box_sizing, "padding_top"sv, "padding-top"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "padding_right"sv, "padding-right"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "padding_bottom"sv, "padding-bottom"sv);
|
||||||
|
set_pixel_value_from(node_box_sizing, "padding_left"sv, "padding-left"sv);
|
||||||
|
|
||||||
|
set_computed_value_from(computed_style, "box-sizing"sv);
|
||||||
|
set_computed_value_from(computed_style, "display"sv);
|
||||||
|
set_computed_value_from(computed_style, "float"sv);
|
||||||
|
set_computed_value_from(computed_style, "line-height"sv);
|
||||||
|
set_computed_value_from(computed_style, "position"sv);
|
||||||
|
set_computed_value_from(computed_style, "z-index"sv);
|
||||||
|
|
||||||
|
send_message(move(message), move(block_token));
|
||||||
|
}
|
||||||
|
|
||||||
|
void PageStyleActor::received_computed_style(JsonObject const& computed_style, BlockToken block_token)
|
||||||
|
{
|
||||||
|
JsonObject computed;
|
||||||
|
|
||||||
|
computed_style.for_each_member([&](String const& name, JsonValue const& value) {
|
||||||
|
JsonObject property;
|
||||||
|
property.set("matched"sv, true);
|
||||||
|
property.set("value"sv, value);
|
||||||
|
computed.set(name, move(property));
|
||||||
|
});
|
||||||
|
|
||||||
|
JsonObject message;
|
||||||
|
message.set("from"sv, name());
|
||||||
|
message.set("computed"sv, move(computed));
|
||||||
|
send_message(move(message), move(block_token));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,14 +15,22 @@ class PageStyleActor final : public Actor {
|
||||||
public:
|
public:
|
||||||
static constexpr auto base_name = "page-style"sv;
|
static constexpr auto base_name = "page-style"sv;
|
||||||
|
|
||||||
static NonnullRefPtr<PageStyleActor> create(DevToolsServer&, String name);
|
static NonnullRefPtr<PageStyleActor> create(DevToolsServer&, String name, WeakPtr<InspectorActor>);
|
||||||
virtual ~PageStyleActor() override;
|
virtual ~PageStyleActor() override;
|
||||||
|
|
||||||
virtual void handle_message(StringView type, JsonObject const&) override;
|
virtual void handle_message(StringView type, JsonObject const&) override;
|
||||||
JsonValue serialize_style() const;
|
JsonValue serialize_style() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
PageStyleActor(DevToolsServer&, String name);
|
PageStyleActor(DevToolsServer&, String name, WeakPtr<InspectorActor>);
|
||||||
|
|
||||||
|
template<typename Callback>
|
||||||
|
void inspect_dom_node(StringView node_actor, Callback&&);
|
||||||
|
|
||||||
|
void received_layout(JsonObject const& computed_style, JsonObject const& node_box_sizing, BlockToken);
|
||||||
|
void received_computed_style(JsonObject const& computed_style, BlockToken);
|
||||||
|
|
||||||
|
WeakPtr<InspectorActor> m_inspector;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,6 +76,7 @@ JsonObject TabActor::serialize_description() const
|
||||||
void TabActor::reset_selected_node()
|
void TabActor::reset_selected_node()
|
||||||
{
|
{
|
||||||
devtools().delegate().clear_highlighted_dom_node(description());
|
devtools().delegate().clear_highlighted_dom_node(description());
|
||||||
|
devtools().delegate().clear_inspected_dom_node(description());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,12 @@ void WalkerActor::handle_message(StringView type, JsonObject const& message)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (type == "getOffsetParent"sv) {
|
||||||
|
response.set("node"sv, JsonValue {});
|
||||||
|
send_message(move(response));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (type == "querySelector"sv) {
|
if (type == "querySelector"sv) {
|
||||||
auto node = message.get_string("node"sv);
|
auto node = message.get_string("node"sv);
|
||||||
if (!node.has_value()) {
|
if (!node.has_value()) {
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <LibDevTools/Forward.h>
|
#include <LibDevTools/Forward.h>
|
||||||
#include <LibWeb/CSS/Selector.h>
|
#include <LibWeb/CSS/Selector.h>
|
||||||
#include <LibWeb/Forward.h>
|
#include <LibWeb/Forward.h>
|
||||||
|
#include <LibWebView/ViewImplementation.h>
|
||||||
|
|
||||||
namespace DevTools {
|
namespace DevTools {
|
||||||
|
|
||||||
|
@ -28,6 +29,10 @@ public:
|
||||||
using OnTabInspectionComplete = Function<void(ErrorOr<JsonValue>)>;
|
using OnTabInspectionComplete = Function<void(ErrorOr<JsonValue>)>;
|
||||||
virtual void inspect_tab(TabDescription const&, OnTabInspectionComplete) const { }
|
virtual void inspect_tab(TabDescription const&, OnTabInspectionComplete) const { }
|
||||||
|
|
||||||
|
using OnDOMNodeInspectionComplete = Function<void(ErrorOr<WebView::ViewImplementation::DOMNodeProperties>)>;
|
||||||
|
virtual void inspect_dom_node(TabDescription const&, Web::UniqueNodeID, Optional<Web::CSS::Selector::PseudoElement::Type>, OnDOMNodeInspectionComplete) const { }
|
||||||
|
virtual void clear_inspected_dom_node(TabDescription const&) const { }
|
||||||
|
|
||||||
virtual void highlight_dom_node(TabDescription const&, Web::UniqueNodeID, Optional<Web::CSS::Selector::PseudoElement::Type>) const { }
|
virtual void highlight_dom_node(TabDescription const&, Web::UniqueNodeID, Optional<Web::CSS::Selector::PseudoElement::Type>) const { }
|
||||||
virtual void clear_highlighted_dom_node(TabDescription const&) const { }
|
virtual void clear_highlighted_dom_node(TabDescription const&) const { }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue