diff --git a/Userland/Applications/Browser/WebDriverConnection.cpp b/Userland/Applications/Browser/WebDriverConnection.cpp index 67b4eb2514..4e7ffda3c3 100644 --- a/Userland/Applications/Browser/WebDriverConnection.cpp +++ b/Userland/Applications/Browser/WebDriverConnection.cpp @@ -60,4 +60,11 @@ void WebDriverConnection::back() browser_window->active_tab().go_back(); } +void WebDriverConnection::forward() +{ + dbgln("WebDriverConnection: forward"); + if (auto browser_window = m_browser_window.strong_ref()) + browser_window->active_tab().go_forward(); +} + } diff --git a/Userland/Applications/Browser/WebDriverConnection.h b/Userland/Applications/Browser/WebDriverConnection.h index 5815012b8a..780ba9f016 100644 --- a/Userland/Applications/Browser/WebDriverConnection.h +++ b/Userland/Applications/Browser/WebDriverConnection.h @@ -41,6 +41,7 @@ public: virtual Messages::WebDriverSessionClient::GetTitleResponse get_title() override; virtual void refresh() override; virtual void back() override; + virtual void forward() override; private: WebDriverConnection(NonnullOwnPtr socket, NonnullRefPtr browser_window); diff --git a/Userland/Applications/Browser/WebDriverSessionClient.ipc b/Userland/Applications/Browser/WebDriverSessionClient.ipc index 3d5b56d64d..872de32c3f 100644 --- a/Userland/Applications/Browser/WebDriverSessionClient.ipc +++ b/Userland/Applications/Browser/WebDriverSessionClient.ipc @@ -8,4 +8,5 @@ endpoint WebDriverSessionClient { get_title() => (String title) refresh() =| back() =| + forward() =| } diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 7f4969f28e..293a0511ef 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -28,6 +28,7 @@ Vector Client::s_routes = { { HTTP::HttpRequest::Method::DELETE, { "session", ":session_id", "window" }, &Client::handle_delete_window }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "refresh" }, &Client::handle_refresh }, { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "back" }, &Client::handle_back }, + { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "forward" }, &Client::handle_forward }, }; Client::Client(NonnullOwnPtr socket, Core::Object* parent) @@ -475,4 +476,15 @@ ErrorOr Client::handle_back(Vector parameters, return make_json_value(result); } +// POST /session/{session id}/forward https://w3c.github.io/webdriver/#dfn-forward +ErrorOr Client::handle_forward(Vector parameters, JsonValue const&) +{ + dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//forward"); + Session* session = TRY(find_session_with_id(parameters[0])); + + // NOTE: Spec steps handled in Session::forward(). + auto result = TRY(session->forward()); + return make_json_value(result); +} + } diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h index 56a69817cd..47c9fb34dc 100644 --- a/Userland/Services/WebDriver/Client.h +++ b/Userland/Services/WebDriver/Client.h @@ -55,6 +55,7 @@ private: ErrorOr handle_delete_window(Vector, JsonValue const& payload); ErrorOr handle_refresh(Vector, JsonValue const& payload); ErrorOr handle_back(Vector, JsonValue const& payload); + ErrorOr handle_forward(Vector, JsonValue const& payload); ErrorOr find_session_with_id(StringView session_id); JsonValue make_json_value(JsonValue const&); diff --git a/Userland/Services/WebDriver/Session.cpp b/Userland/Services/WebDriver/Session.cpp index 7229dd3c87..a6bc4c2fce 100644 --- a/Userland/Services/WebDriver/Session.cpp +++ b/Userland/Services/WebDriver/Session.cpp @@ -206,4 +206,27 @@ ErrorOr Session::back() return JsonValue(); } +// POST /session/{session id}/forward https://w3c.github.io/webdriver/#dfn-forward +ErrorOr Session::forward() +{ + // 1. If the current top-level browsing context is no longer open, return error with error code no such window. + auto current_window = get_window_object(); + if (!current_window.has_value()) + return HttpError { 404, "no such window", "Window not found" }; + + // FIXME: 2. Handle any user prompts and return its value if it is an error. + + // 3. Traverse the history by a delta 1 for the current browsing context. + m_browser_connection->async_forward(); + + // FIXME: 4. If the previous step completed results in a pageHide event firing, wait until pageShow event + // fires or for the session page load timeout milliseconds to pass, whichever occurs sooner. + + // FIXME: 5. If the previous step completed by the session page load timeout being reached, and user + // prompts have been handled, return error with error code timeout. + + // 6. Return success with data null. + return JsonValue(); +} + } diff --git a/Userland/Services/WebDriver/Session.h b/Userland/Services/WebDriver/Session.h index c276d9514f..053edca7df 100644 --- a/Userland/Services/WebDriver/Session.h +++ b/Userland/Services/WebDriver/Session.h @@ -39,6 +39,7 @@ public: ErrorOr get_title(); ErrorOr refresh(); ErrorOr back(); + ErrorOr forward(); private: NonnullRefPtr m_client;