From 89b2ff72f7b63ec378595f5931ff1166a512c792 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 2 Nov 2022 09:44:43 -0400 Subject: [PATCH] WebDriver+Browser: Implement `POST /session/{id}/window/maximize` --- .../Browser/WebDriverConnection.cpp | 7 +++++++ .../Browser/WebDriverConnection.h | 1 + .../Browser/WebDriverSessionClient.ipc | 1 + Userland/Services/WebDriver/Client.cpp | 11 ++++++++++ Userland/Services/WebDriver/Client.h | 1 + Userland/Services/WebDriver/Session.cpp | 21 +++++++++++++++++++ Userland/Services/WebDriver/Session.h | 1 + 7 files changed, 43 insertions(+) diff --git a/Userland/Applications/Browser/WebDriverConnection.cpp b/Userland/Applications/Browser/WebDriverConnection.cpp index 48a12384a0..3c286ce927 100644 --- a/Userland/Applications/Browser/WebDriverConnection.cpp +++ b/Userland/Applications/Browser/WebDriverConnection.cpp @@ -102,6 +102,13 @@ void WebDriverConnection::set_window_position(Gfx::IntPoint const& position) browser_window->move_to(position); } +void WebDriverConnection::maximize_window() +{ + dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: maximize_window"); + if (auto browser_window = m_browser_window.strong_ref()) + browser_window->set_maximized(true); +} + Messages::WebDriverSessionClient::GetAllCookiesResponse WebDriverConnection::get_all_cookies() { dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: get_cookies"); diff --git a/Userland/Applications/Browser/WebDriverConnection.h b/Userland/Applications/Browser/WebDriverConnection.h index 92cbf5643e..89cae679a2 100644 --- a/Userland/Applications/Browser/WebDriverConnection.h +++ b/Userland/Applications/Browser/WebDriverConnection.h @@ -47,6 +47,7 @@ public: virtual void restore_window() override; virtual void set_window_size(Gfx::IntSize const&) override; virtual void set_window_position(Gfx::IntPoint const&) override; + virtual void maximize_window() override; virtual Messages::WebDriverSessionClient::GetAllCookiesResponse get_all_cookies() override; virtual Messages::WebDriverSessionClient::GetNamedCookieResponse get_named_cookie(String const& name) override; virtual void add_cookie(Web::Cookie::ParsedCookie const&) override; diff --git a/Userland/Applications/Browser/WebDriverSessionClient.ipc b/Userland/Applications/Browser/WebDriverSessionClient.ipc index 733fbccd69..44a1868ee5 100644 --- a/Userland/Applications/Browser/WebDriverSessionClient.ipc +++ b/Userland/Applications/Browser/WebDriverSessionClient.ipc @@ -19,6 +19,7 @@ endpoint WebDriverSessionClient { restore_window() =| set_window_size(Gfx::IntSize size) =| set_window_position(Gfx::IntPoint position) =| + maximize_window() =| get_all_cookies() => (Vector cookies) get_named_cookie(String name) => (Optional cookie) add_cookie(Web::Cookie::ParsedCookie cookie) =| diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 625c83c4f4..0ba89fecff 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -38,6 +38,7 @@ Vector Client::s_routes = { { HTTP::HttpRequest::Method::GET, { "session", ":session_id", "window", "handles" }, &Client::handle_get_window_handles }, { HTTP::HttpRequest::Method::GET, { "session", ":session_id", "window", "rect" }, &Client::handle_get_window_rect }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "window", "rect" }, &Client::handle_set_window_rect }, + { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "window", "maximize" }, &Client::handle_maximize_window }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "element" }, &Client::handle_find_element }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "elements" }, &Client::handle_find_elements }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "element", ":element_id", "element" }, &Client::handle_find_element_from_element }, @@ -565,6 +566,16 @@ ErrorOr Client::handle_set_window_rect(Vector Client::handle_maximize_window(Vector const& parameters, JsonValue const&) +{ + dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//window/maximize"); + auto* session = TRY(find_session_with_id(parameters[0])); + auto result = TRY(session->maximize_window()); + return make_json_value(result); +} + // 12.3.2 Find Element, https://w3c.github.io/webdriver/#dfn-find-element // POST /session/{session id}/element ErrorOr Client::handle_find_element(Vector const& parameters, JsonValue const& payload) diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h index 23cf1bcceb..35270c4640 100644 --- a/Userland/Services/WebDriver/Client.h +++ b/Userland/Services/WebDriver/Client.h @@ -63,6 +63,7 @@ private: ErrorOr handle_get_window_handles(Vector const&, JsonValue const& payload); ErrorOr handle_get_window_rect(Vector const&, JsonValue const& payload); ErrorOr handle_set_window_rect(Vector const&, JsonValue const& payload); + ErrorOr handle_maximize_window(Vector const&, JsonValue const& payload); ErrorOr handle_find_element(Vector const&, JsonValue const& payload); ErrorOr handle_find_elements(Vector const&, JsonValue const& payload); ErrorOr handle_find_element_from_element(Vector const&, JsonValue const& payload); diff --git a/Userland/Services/WebDriver/Session.cpp b/Userland/Services/WebDriver/Session.cpp index 957b3b6167..2c7c10e98c 100644 --- a/Userland/Services/WebDriver/Session.cpp +++ b/Userland/Services/WebDriver/Session.cpp @@ -380,6 +380,27 @@ ErrorOr Session::set_window_rect(JsonValue const& pay return serialize_window_rect(m_browser_connection->get_window_rect()); } +// 11.8.3 Maximize Window, https://w3c.github.io/webdriver/#dfn-maximize-window +ErrorOr Session::maximize_window() +{ + // 1. If the remote end does not support the Maximize Window command for the current top-level browsing context for any reason, return error with error code unsupported operation. + + // 2. If the current top-level browsing context is no longer open, return error with error code no such window. + TRY(check_for_open_top_level_browsing_context_or_return_error()); + + // FIXME: 3. Handle any user prompts and return its value if it is an error. + // FIXME: 4. Fully exit fullscreen. + + // 5. Restore the window. + m_browser_connection->async_restore_window(); + + // 6. Maximize the window of the current top-level browsing context. + m_browser_connection->async_maximize_window(); + + // 7. Return success with data set to the WindowRect object for the current top-level browsing context. + return serialize_window_rect(m_browser_connection->get_window_rect()); +} + // https://w3c.github.io/webdriver/#dfn-get-or-create-a-web-element-reference static String get_or_create_a_web_element_reference(Session::LocalElement const& element) { diff --git a/Userland/Services/WebDriver/Session.h b/Userland/Services/WebDriver/Session.h index 4967d1087b..8640cdbc0f 100644 --- a/Userland/Services/WebDriver/Session.h +++ b/Userland/Services/WebDriver/Session.h @@ -52,6 +52,7 @@ public: ErrorOr get_window_handles() const; ErrorOr get_window_rect(); ErrorOr set_window_rect(JsonValue const& payload); + ErrorOr maximize_window(); ErrorOr find_element(JsonValue const& payload); ErrorOr find_elements(JsonValue const& payload); ErrorOr find_element_from_element(JsonValue const& payload, StringView parameter_element_id);