beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Browser+WebContent+WebDriver: Move Back, Forward, Refresh to WebContent

Browse source
This commit is contained in:
Timothy Flynn 2022-11-11 13:46:22 -05:00 committed by Linus Groh
parent 24fb7cd0ad
commit 7f142745e2
Notes: sideshowbarker 2024-07-17 05:01:20 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/7f142745e2
Pull-request: https://github.com/SerenityOS/serenity/pull/16033
Reviewed-by: https://github.com/linusg ✅
10 changed files with 77 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Applications/Browser/Tab.cpp
View file

@ -236,6 +236,18 @@ Tab::Tab(BrowserWindow& window)
m_web_content_view->inspect_dom_tree();
};
view().on_navigate_back = [this]() {
go_back(1);
};
view().on_navigate_forward = [this]() {
go_forward(1);
};
view().on_refresh = [this]() {
reload();
};
view().on_link_click = [this](auto& url, auto& target, unsigned modifiers) {
if (target == "_blank" || modifiers == Mod_Ctrl) {
on_tab_open_request(url);

21
Userland/Applications/Browser/WebDriverConnection.cpp
View file

@ -35,25 +35,4 @@ Messages::WebDriverSessionClient::GetTitleResponse WebDriverConnection::get_titl
return { "" };
}
void WebDriverConnection::refresh()
{
dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: refresh");
if (auto browser_window = m_browser_window.strong_ref())
browser_window->active_tab().reload();
}
void WebDriverConnection::back()
{
dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: back");
if (auto browser_window = m_browser_window.strong_ref())
browser_window->active_tab().go_back();
}
void WebDriverConnection::forward()
{
dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: forward");
if (auto browser_window = m_browser_window.strong_ref())
browser_window->active_tab().go_forward();
}
}

3
Userland/Applications/Browser/WebDriverConnection.h
View file

@ -39,9 +39,6 @@ public:
virtual void quit() override;
virtual Messages::WebDriverSessionClient::GetTitleResponse get_title() override;
virtual void refresh() override;
virtual void back() override;
virtual void forward() override;
private:
WebDriverConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket, NonnullRefPtr<BrowserWindow> browser_window);

3
Userland/Applications/Browser/WebDriverSessionClient.ipc
View file

@ -15,7 +15,4 @@ endpoint WebDriverSessionClient {
quit() =|
get_title() => (String title)
refresh() =|
back() =|
forward() =|
}

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

@ -5,6 +5,9 @@ endpoint WebDriverClient {
set_is_webdriver_active(bool active) =|
navigate_to(JsonValue payload) => (Web::WebDriver::Response response)
get_current_url() => (Web::WebDriver::Response response)
back() => (Web::WebDriver::Response response)
forward() => (Web::WebDriver::Response response)
refresh() => (Web::WebDriver::Response response)
get_window_rect() => (Web::WebDriver::Response response)
set_window_rect(JsonValue payload) => (Web::WebDriver::Response response)
maximize_window() => (Web::WebDriver::Response response)

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

@ -290,6 +290,62 @@ Messages::WebDriverClient::GetCurrentUrlResponse WebDriverConnection::get_curren
return make_success_response(url);
}
// 10.3 Back, https://w3c.github.io/webdriver/#dfn-back
Messages::WebDriverClient::BackResponse WebDriverConnection::back()
{
// 1. If the current top-level 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. Traverse the history by a delta –1 for the current browsing context.
m_web_content_client.async_did_request_navigate_back();
// 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 make_success_response({});
}
// 10.4 Forward, https://w3c.github.io/webdriver/#dfn-forward
Messages::WebDriverClient::ForwardResponse WebDriverConnection::forward()
{
// 1. If the current top-level 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. Traverse the history by a delta 1 for the current browsing context.
m_web_content_client.async_did_request_navigate_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 make_success_response({});
}
// 10.5 Refresh, https://w3c.github.io/webdriver/#dfn-refresh
Messages::WebDriverClient::RefreshResponse WebDriverConnection::refresh()
{
// 1. If the current top-level 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. Initiate an overridden reload of the current top-level browsing context’s active document.
m_web_content_client.async_did_request_refresh();
// FIXME: 4. If url is special except for file:
// FIXME: 1. Try to wait for navigation to complete.
// FIXME: 2. Try to run the post-navigation checks.
// FIXME: 5. Set the current browsing context with current top-level browsing context.
// 6. Return success with data null.
return make_success_response({});
}
// 11.8.1 Get Window Rect, https://w3c.github.io/webdriver/#dfn-get-window-rect
Messages::WebDriverClient::GetWindowRectResponse WebDriverConnection::get_window_rect()
{

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

@ -37,6 +37,9 @@ private:
virtual void set_is_webdriver_active(bool) override;
virtual Messages::WebDriverClient::NavigateToResponse navigate_to(JsonValue const& payload) override;
virtual Messages::WebDriverClient::GetCurrentUrlResponse get_current_url() override;
virtual Messages::WebDriverClient::BackResponse back() override;
virtual Messages::WebDriverClient::ForwardResponse forward() override;
virtual Messages::WebDriverClient::RefreshResponse refresh() override;
virtual Messages::WebDriverClient::GetWindowRectResponse get_window_rect() override;
virtual Messages::WebDriverClient::SetWindowRectResponse set_window_rect(JsonValue const& payload) override;
virtual Messages::WebDriverClient::MaximizeWindowResponse maximize_window() override;

9
Userland/Services/WebDriver/Client.cpp
View file

@ -512,8 +512,7 @@ Web::WebDriver::Response Client::handle_back(Vector<StringView> const& parameter
{
dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/back");
auto* session = TRY(find_session_with_id(parameters[0]));
auto result = TRY(session->back());
return make_json_value(result);
return session->web_content_connection().back();
}
// 10.4 Forward, https://w3c.github.io/webdriver/#dfn-forward
@ -522,8 +521,7 @@ Web::WebDriver::Response Client::handle_forward(Vector<StringView> const& parame
{
dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/forward");
auto* session = TRY(find_session_with_id(parameters[0]));
auto result = TRY(session->forward());
return make_json_value(result);
return session->web_content_connection().forward();
}
// 10.5 Refresh, https://w3c.github.io/webdriver/#dfn-refresh
@ -532,8 +530,7 @@ Web::WebDriver::Response Client::handle_refresh(Vector<StringView> const& parame
{
dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/refresh");
auto* session = TRY(find_session_with_id(parameters[0]));
auto result = TRY(session->refresh());
return make_json_value(result);
return session->web_content_connection().refresh();
}
// 10.6 Get Title, https://w3c.github.io/webdriver/#dfn-get-title

65
Userland/Services/WebDriver/Session.cpp
View file

@ -172,71 +172,6 @@ Web::WebDriver::Response Session::set_timeouts(JsonValue const& payload)
return JsonValue {};
}
// 10.3 Back, https://w3c.github.io/webdriver/#dfn-back
Web::WebDriver::Response Session::back()
{
// 1. 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: 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_back();
// 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();
}
// 10.4 Forward, https://w3c.github.io/webdriver/#dfn-forward
Web::WebDriver::Response Session::forward()
{
// 1. 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: 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();
}
// 10.5 Refresh, https://w3c.github.io/webdriver/#dfn-refresh
Web::WebDriver::Response Session::refresh()
{
// 1. 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: 2. Handle any user prompts and return its value if it is an error.
// 3. Initiate an overridden reload of the current top-level browsing context’s active document.
m_browser_connection->async_refresh();
// FIXME: 4. If url is special except for file:
// FIXME: 1. Try to wait for navigation to complete.
// FIXME: 2. Try to run the post-navigation checks.
// FIXME: 5. Set the current browsing context with current top-level browsing context.
// 6. Return success with data null.
return JsonValue();
}
// 10.6 Get Title, https://w3c.github.io/webdriver/#dfn-get-title
Web::WebDriver::Response Session::get_title()
{

3
Userland/Services/WebDriver/Session.h
View file

@ -51,9 +51,6 @@ public:
Web::WebDriver::Response stop();
JsonObject get_timeouts();
Web::WebDriver::Response set_timeouts(JsonValue const& payload);
Web::WebDriver::Response back();
Web::WebDriver::Response forward();
Web::WebDriver::Response refresh();
Web::WebDriver::Response get_title();
Web::WebDriver::Response get_window_handle();
ErrorOr<void, Variant<Web::WebDriver::Error, Error>> close_window();