fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-03 07:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebContent+LibWebView: Consolidate the way browsers connect to WebDriver

Browse Source 
Currently, on Serenity, we connect to WebDriver from the browser-side of
the WebContent connection for both Browser and headless-browser.

On Lagom, we connect from within the WebContent process itself, signaled
by a command line flag.

This patch changes Lagom browsers to connect to WebDriver the same way
that Serenity browsers do. This will ensure we can do other initializers
in the same order across all platforms and browsers.
This commit is contained in:
Timothy Flynn
2023-03-16 08:50:22 -04:00
committed by Linus Groh
parent 3a7257c9fe
commit 700ad6bf35
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ladybird/WebContent/main.cpp
View File

@@ -83,11 +83,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
dbgln("Failed to load content filters: {}", maybe_content_filter_error.error());
int webcontent_fd_passing_socket { -1 };
DeprecatedString webdriver_content_ipc_path;
Core::ArgsParser args_parser;
args_parser.add_option(webcontent_fd_passing_socket, "File descriptor of the passing socket for the WebContent connection", "webcontent-fd-passing-socket", 'c', "webcontent_fd_passing_socket");
args_parser.add_option(webdriver_content_ipc_path, "Path to WebDriver IPC for WebContent", "webdriver-content-path", 0, "path");
args_parser.parse(arguments);
VERIFY(webcontent_fd_passing_socket >= 0);
@@ -100,11 +98,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
proxy_socket_through_notifier(*webcontent_client, webcontent_notifier);
QSocketNotifier webdriver_notifier(QSocketNotifier::Type::Read);
RefPtr<WebContent::WebDriverConnection> webdriver_client;
if (!webdriver_content_ipc_path.is_empty()) {
webdriver_client = TRY(WebContent::WebDriverConnection::connect(webcontent_client->page_host(), webdriver_content_ipc_path));
proxy_socket_through_notifier(*webdriver_client, webdriver_notifier);
}
webcontent_client->page_host().on_webdriver_connection = [&](auto& webdriver) {
proxy_socket_through_notifier(webdriver, webdriver_notifier);
};
return app.exec();
}