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

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
Notes: sideshowbarker 2024-07-17 07:43:44 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/7be8931ca0
Pull-request: https://github.com/SerenityOS/serenity/pull/17748
Reviewed-by: https://github.com/kalenikaliaksandr
Reviewed-by: https://github.com/linusg ✅
2 changed files with 15 additions and 8 deletions
Show stats 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();

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

@ -36,8 +36,10 @@ public:
WebContentConnection& web_content_connection() const
{
auto const& current_window = m_windows.get(m_current_window_handle).value();
return current_window.web_content_connection;
auto current_window = m_windows.get(m_current_window_handle);
VERIFY(current_window.has_value());
return current_window->web_content_connection;
}
String const& current_window_handle() const