RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 09:07:44 +00:00
Code Issues Activity Actions

Browser+WebContent+WebDriver: Move Get Element Tag Name to WebContent

Browse source
This commit is contained in:
Timothy Flynn 2022-11-10 10:24:49 -05:00 • committed by Linus Groh
parent 5d32fd7026
commit 9dd62228c8
16 changed files with 22 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -494,15 +494,6 @@ void ConnectionFromClient::scroll_element_into_view(i32 element_id)
element->scroll_into_view(options);
}
Messages::WebContentServer::GetElementTagNameResponse ConnectionFromClient::get_element_tag_name(i32 element_id)
{
auto element = find_element_by_id(element_id);
if (!element.has_value())
return { "" };
return { element->tag_name() };
}
// https://w3c.github.io/webdriver/#dfn-calculate-the-absolute-position
static Gfx::IntPoint calculate_absolute_position_of_element(Web::Page const& page, JS::NonnullGCPtr<Web::Geometry::DOMRect> rect)
{

1
Userland/Services/WebContent/ConnectionFromClient.h
View file

@ -84,7 +84,6 @@ private:
virtual void js_console_request_messages(i32) override;
virtual void scroll_element_into_view(i32 element_id) override;
virtual Messages::WebContentServer::GetElementTagNameResponse get_element_tag_name(i32 element_id) override;
virtual Messages::WebContentServer::GetElementRectResponse get_element_rect(i32 element_id) override;
virtual Messages::WebContentServer::IsElementEnabledResponse is_element_enabled(i32 element_id) override;
virtual Messages::WebContentServer::TakeElementScreenshotResponse take_element_screenshot(i32 element_id) override;

1
Userland/Services/WebContent/WebContentServer.ipc
View file

@ -43,7 +43,6 @@ endpoint WebContentServer
js_console_request_messages(i32 start_index) =|
scroll_element_into_view(i32 element_id) => ()
get_element_tag_name(i32 element_id) => (String tag_name)
get_element_rect(i32 element_id) => (Gfx::IntRect rect)
is_element_enabled(i32 element_id) => (bool enabled)
take_element_screenshot(i32 element_id) => (Gfx::ShareableBitmap data)

1
Userland/Services/WebContent/WebDriverClient.ipc
View file

@ -18,4 +18,5 @@ endpoint WebDriverClient {
get_element_property(String element_id, String name) => (Web::WebDriver::Response response)
get_element_css_value(String element_id, String name) => (Web::WebDriver::Response response)
get_element_text(String element_id) => (Web::WebDriver::Response response)
get_element_tag_name(String element_id) => (Web::WebDriver::Response response)
}

18
Userland/Services/WebContent/WebDriverConnection.cpp
View file

@ -608,6 +608,24 @@ Messages::WebDriverClient::GetElementTextResponse WebDriverConnection::get_eleme
return make_success_response(move(rendered_text));
}
// 12.4.6 Get Element Tag Name, https://w3c.github.io/webdriver/#dfn-get-element-tag-name
Messages::WebDriverClient::GetElementTagNameResponse WebDriverConnection::get_element_tag_name(String const& element_id)
{
// 1. If the current browsing context is no longer open, return error with error code no such window.
TRY(ensure_open_top_level_browsing_context());
// FIXME: 2. Handle any user prompts and return its value if it is an error.
// 3. Let element be the result of trying to get a known connected element with url variable element id.
auto* element = TRY(get_known_connected_element(element_id));
// 4. Let qualified name be the result of getting element’s tagName IDL attribute.
auto qualified_name = element->tag_name();
// 5. Return success with data qualified name.
return make_success_response(move(qualified_name));
}
// https://w3c.github.io/webdriver/#dfn-no-longer-open
ErrorOr<void, Web::WebDriver::Error> WebDriverConnection::ensure_open_top_level_browsing_context()
{

1
Userland/Services/WebContent/WebDriverConnection.h
View file

@ -48,6 +48,7 @@ private:
virtual Messages::WebDriverClient::GetElementPropertyResponse get_element_property(String const& element_id, String const& name) override;
virtual Messages::WebDriverClient::GetElementCssValueResponse get_element_css_value(String const& element_id, String const& name) override;
virtual Messages::WebDriverClient::GetElementTextResponse get_element_text(String const& element_id) override;
virtual Messages::WebDriverClient::GetElementTagNameResponse get_element_tag_name(String const& element_id) override;
ErrorOr<void, Web::WebDriver::Error> ensure_open_top_level_browsing_context();
void restore_the_window();