mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 04:17:34 +00:00
Browser+WebContent+WebDriver: Move Is Element Selected to WebContent
This commit is contained in:
parent
560da56a1d
commit
04ea3992e9
16 changed files with 40 additions and 76 deletions
|
@ -611,10 +611,6 @@ void BrowserWindow::create_new_tab(URL url, bool activate)
|
|||
active_tab().view().scroll_element_into_view(element_id);
|
||||
};
|
||||
|
||||
new_tab.webdriver_endpoints().on_is_element_selected = [this](i32 element_id) {
|
||||
return active_tab().view().is_element_selected(element_id);
|
||||
};
|
||||
|
||||
new_tab.webdriver_endpoints().on_get_element_attribute = [this](i32 element_id, String const& name) {
|
||||
return active_tab().view().get_element_attribute(element_id, name);
|
||||
};
|
||||
|
|
|
@ -146,17 +146,6 @@ void WebDriverConnection::scroll_element_into_view(i32 element_id)
|
|||
}
|
||||
}
|
||||
|
||||
Messages::WebDriverSessionClient::IsElementSelectedResponse WebDriverConnection::is_element_selected(i32 element_id)
|
||||
{
|
||||
dbgln("WebDriverConnection: is_element_selected {}", element_id);
|
||||
if (auto browser_window = m_browser_window.strong_ref()) {
|
||||
auto& tab = browser_window->active_tab();
|
||||
if (tab.webdriver_endpoints().on_is_element_selected)
|
||||
return { tab.webdriver_endpoints().on_is_element_selected(element_id) };
|
||||
}
|
||||
return { false };
|
||||
}
|
||||
|
||||
Messages::WebDriverSessionClient::GetElementAttributeResponse WebDriverConnection::get_element_attribute(i32 element_id, String const& name)
|
||||
{
|
||||
dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: get_element_attribute");
|
||||
|
|
|
@ -49,7 +49,6 @@ public:
|
|||
virtual void add_cookie(Web::Cookie::ParsedCookie const&) override;
|
||||
virtual void update_cookie(Web::Cookie::Cookie const&) override;
|
||||
virtual void scroll_element_into_view(i32 element_id) override;
|
||||
virtual Messages::WebDriverSessionClient::IsElementSelectedResponse is_element_selected(i32 element_id) override;
|
||||
virtual Messages::WebDriverSessionClient::GetElementAttributeResponse get_element_attribute(i32 element_id, String const& name) override;
|
||||
virtual Messages::WebDriverSessionClient::GetElementPropertyResponse get_element_property(i32 element_id, String const& name) override;
|
||||
virtual Messages::WebDriverSessionClient::GetActiveDocumentsTypeResponse get_active_documents_type() override;
|
||||
|
|
|
@ -24,7 +24,6 @@ public:
|
|||
~WebDriverEndpoints() = default;
|
||||
|
||||
Function<void(i32 element_id)> on_scroll_element_into_view;
|
||||
Function<bool(i32 element_id)> on_is_element_selected;
|
||||
Function<Optional<String>(i32 element_id, String const&)> on_get_element_attribute;
|
||||
Function<Optional<String>(i32 element_id, String const&)> on_get_element_property;
|
||||
Function<String()> on_get_active_documents_type;
|
||||
|
|
|
@ -25,7 +25,6 @@ endpoint WebDriverSessionClient {
|
|||
add_cookie(Web::Cookie::ParsedCookie cookie) =|
|
||||
update_cookie(Web::Cookie::Cookie cookie) =|
|
||||
scroll_element_into_view(i32 element_id) => ()
|
||||
is_element_selected(i32 element_id) => (bool selected)
|
||||
get_element_attribute(i32 element_id, String name) => (Optional<String> atttibute)
|
||||
get_element_property(i32 element_id, String name) => (Optional<String> property)
|
||||
get_active_documents_type() => (String type)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue