RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:37:44 +00:00
Code Issues Activity Actions

WebDriver: Defer removing closed window handles until no longer needed

Browse source 
WebDriver::Session::close_window may invoke Session::stop, which needs
the WebContent connection to still exist. Do not remove the window's
handle (thus destroying the connection) until it is no longer needed.
This commit is contained in:
Timothy Flynn 2023-03-07 09:16:01 -05:00 • committed by Linus Groh
parent ae1611aa08
commit 7be8931ca0
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#include "Session.h"
#include "Client.h"
#include <AK/JsonObject.h>
#include <AK/ScopeGuard.h>
#include <LibCore/LocalServer.h>
#include <LibCore/StandardPaths.h>
#include <LibCore/System.h>
@ -117,13 +118,17 @@ Web::WebDriver::Response Session::stop()
// 11.2 Close Window, https://w3c.github.io/webdriver/#dfn-close-window
Web::WebDriver::Response Session::close_window()
{
// 3. Close the current top-level browsing context.
TRY(web_content_connection().close_window());
m_windows.remove(m_current_window_handle);
{
// Defer removing the window handle from this session until after we know we are done with its connection.
ScopeGuard guard { [this] { m_windows.remove(m_current_window_handle); } };
// 4. If there are no more open top-level browsing contexts, then close the session.
if (m_windows.is_empty())
TRY(stop());
// 3. Close the current top-level browsing context.
TRY(web_content_connection().close_window());
// 4. If there are no more open top-level browsing contexts, then close the session.
if (m_windows.size() == 1)
TRY(stop());
}
// 5. Return the result of running the remote end steps for the Get Window Handles command.
return get_window_handles();