mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-06 01:26:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

WebContent: Abort WebDriver navigation if session timeout exceeded

Browse source
This commit is contained in:
Tim Ledbetter 2024-08-09 21:03:43 +01:00 • committed by Andreas Kling
commit fbff0ca6a8
Notes: github-actions[bot] 2024-08-10 08:38:37 +00:00
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1931,11 +1931,15 @@ ErrorOr<void, Web::WebDriver::Error> WebDriverConnection::wait_for_navigation_to
if (m_page_client->page().top_level_browsing_context().has_navigable_been_destroyed()) if (m_page_client->page().top_level_browsing_context().has_navigable_been_destroyed())
return {}; return {};
// FIXME: 3. Start a timer. If this algorithm has not completed before timer reaches the session’s session page load timeout in milliseconds, return an error with error code timeout. // 3. Start a timer. If this algorithm has not completed before timer reaches the session’s session page load timeout in milliseconds, return an error with error code timeout.
auto page_load_timeout_fired = false;
auto timer = Core::Timer::create_single_shot(m_timeouts_configuration.page_load_timeout, [&] {
page_load_timeout_fired = true;
});
// 4. If there is an ongoing attempt to navigate the current browsing context that has not yet matured, wait for navigation to mature. // 4. If there is an ongoing attempt to navigate the current browsing context that has not yet matured, wait for navigation to mature.
Web::Platform::EventLoopPlugin::the().spin_until([&] { Web::Platform::EventLoopPlugin::the().spin_until([&] {
return m_page_client->page().top_level_traversable()->ongoing_navigation() == Empty {}; return page_load_timeout_fired || m_page_client->page().top_level_traversable()->ongoing_navigation() == Empty {};
}); });
// 5. Let readiness target be the document readiness state associated with the current session’s page loading strategy, which can be found in the table of page load strategies. // 5. Let readiness target be the document readiness state associated with the current session’s page loading strategy, which can be found in the table of page load strategies.
@ -1951,12 +1955,14 @@ ErrorOr<void, Web::WebDriver::Error> WebDriverConnection::wait_for_navigation_to
}(); }();
// 6. Wait for the current browsing context’s document readiness state to reach readiness target, // 6. Wait for the current browsing context’s document readiness state to reach readiness target,
// FIXME: or for the session page load timeout to pass, whichever occurs sooner. // or for the session page load timeout to pass, whichever occurs sooner.
Web::Platform::EventLoopPlugin::the().spin_until([&]() { Web::Platform::EventLoopPlugin::the().spin_until([&]() {
return m_page_client->page().top_level_browsing_context().active_document()->readiness() == readiness_target; return page_load_timeout_fired || page_load_timeout_fired || m_page_client->page().top_level_browsing_context().active_document()->readiness() == readiness_target;
}); });
// FIXME: 7. If the previous step completed by the session page load timeout being reached and the browser does not have an active user prompt, return error with error code timeout. // 7. If the previous step completed by the session page load timeout being reached and the browser does not have an active user prompt, return error with error code timeout.
if (page_load_timeout_fired && !m_page_client->page().has_pending_dialog())
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::Timeout, "Navigation timed out"sv);
// 8. Return success with data null. // 8. Return success with data null.
return {}; return {};