RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:17:34 +00:00
Code Issues Activity Actions

WebContent: Add a static helper to find an element by its remote ID

Browse source 
Instead of repeating the same checks for each WebDriver /element
endpoint, add a helper to perform the lookup.
This commit is contained in:
Timothy Flynn 2022-11-03 12:46:05 -04:00 • committed by Linus Groh
parent 99fc94e138
commit 77b6d0bf16
1 changed files with 25 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Userland/Services/WebContent/ConnectionFromClient.cpp
View file

@ -489,35 +489,31 @@ Messages::WebContentServer::QuerySelectorAllResponse ConnectionFromClient::query
return { return_list }; return { return_list };
} }
Messages::WebContentServer::GetElementAttributeResponse ConnectionFromClient::get_element_attribute(i32 element_id, String const& name) static Optional<Web::DOM::Element&> find_element_by_id(i32 element_id)
{ {
auto* node = Web::DOM::Node::from_id(element_id); auto* node = Web::DOM::Node::from_id(element_id);
if (!node) if (!node || !node->is_element())
return {};
return verify_cast<Web::DOM::Element>(*node);
}
Messages::WebContentServer::GetElementAttributeResponse ConnectionFromClient::get_element_attribute(i32 element_id, String const& name)
{
auto element = find_element_by_id(element_id);
if (!element.has_value())
return Optional<String> {}; return Optional<String> {};
if (!node->is_element()) return { element->get_attribute(name) };
return Optional<String> {};
auto& element = verify_cast<Web::DOM::Element>(*node);
if (!element.has_attribute(name))
return Optional<String> {};
return { element.get_attribute(name) };
} }
Messages::WebContentServer::GetElementPropertyResponse ConnectionFromClient::get_element_property(i32 element_id, String const& name) Messages::WebContentServer::GetElementPropertyResponse ConnectionFromClient::get_element_property(i32 element_id, String const& name)
{ {
auto* node = Web::DOM::Node::from_id(element_id); auto element = find_element_by_id(element_id);
if (!node) if (!element.has_value())
return Optional<String> {}; return Optional<String> {};
if (!node->is_element()) auto property_or_error = element->get(name);
return Optional<String> {};
auto& element = verify_cast<Web::DOM::Element>(*node);
auto property_or_error = element.get(name);
if (property_or_error.is_throw_completion()) if (property_or_error.is_throw_completion())
return Optional<String> {}; return Optional<String> {};
@ -526,7 +522,7 @@ Messages::WebContentServer::GetElementPropertyResponse ConnectionFromClient::get
if (property.is_undefined()) if (property.is_undefined())
return Optional<String> {}; return Optional<String> {};
auto string_or_error = property.to_string(element.vm()); auto string_or_error = property.to_string(element->vm());
if (string_or_error.is_error()) if (string_or_error.is_error())
return Optional<String> {}; return Optional<String> {};
@ -556,18 +552,13 @@ Messages::WebContentServer::GetActiveDocumentsTypeResponse ConnectionFromClient:
Messages::WebContentServer::GetComputedValueForElementResponse ConnectionFromClient::get_computed_value_for_element(i32 element_id, String const& property_name) Messages::WebContentServer::GetComputedValueForElementResponse ConnectionFromClient::get_computed_value_for_element(i32 element_id, String const& property_name)
{ {
auto* node = Web::DOM::Node::from_id(element_id); auto element = find_element_by_id(element_id);
if (!node) if (!element.has_value())
return { "" }; return { "" };
if (!node->is_element())
return { "" };
auto& element = verify_cast<Web::DOM::Element>(*node);
auto property_id = Web::CSS::property_id_from_string(property_name); auto property_id = Web::CSS::property_id_from_string(property_name);
auto computed_values = element.computed_css_values(); auto computed_values = element->computed_css_values();
if (!computed_values) if (!computed_values)
return { "" }; return { "" };
@ -578,30 +569,20 @@ Messages::WebContentServer::GetComputedValueForElementResponse ConnectionFromCli
Messages::WebContentServer::GetElementTextResponse ConnectionFromClient::get_element_text(i32 element_id) Messages::WebContentServer::GetElementTextResponse ConnectionFromClient::get_element_text(i32 element_id)
{ {
auto* node = Web::DOM::Node::from_id(element_id); auto element = find_element_by_id(element_id);
if (!node) if (!element.has_value())
return { "" }; return { "" };
if (!node->is_element()) return { element->layout_node()->dom_node()->text_content() };
return { "" };
auto& element = verify_cast<Web::DOM::Element>(*node);
return { element.layout_node()->dom_node()->text_content() };
} }
Messages::WebContentServer::GetElementTagNameResponse ConnectionFromClient::get_element_tag_name(i32 element_id) Messages::WebContentServer::GetElementTagNameResponse ConnectionFromClient::get_element_tag_name(i32 element_id)
{ {
auto* node = Web::DOM::Node::from_id(element_id); auto element = find_element_by_id(element_id);
if (!node) if (!element.has_value())
return { "" }; return { "" };
if (!node->is_element()) return { element->tag_name() };
return { "" };
auto& element = verify_cast<Web::DOM::Element>(*node);
return { element.tag_name() };
} }
Messages::WebContentServer::GetSelectedTextResponse ConnectionFromClient::get_selected_text() Messages::WebContentServer::GetSelectedTextResponse ConnectionFromClient::get_selected_text()