beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

WebDriver: Use the same command line arguments for all browser chromes

Browse source 
In other words, pass the same flags to headless-browser.
This commit is contained in:
Timothy Flynn 2024-10-21 18:55:17 -04:00 committed by Tim Ledbetter
parent b73f9fef5a
commit a67018b2fc
Notes: github-actions[bot] 2024-10-22 03:25:39 +00:00 
Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/a67018b2fc7
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1907
Reviewed-by: https://github.com/tcl3 ✅
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Ladybird/WebDriver/main.cpp
View file

@ -18,7 +18,7 @@
static Vector<ByteString> certificates;
static ErrorOr<pid_t> launch_process(StringView application, ReadonlySpan<char const*> arguments)
static ErrorOr<pid_t> launch_process(StringView application, ReadonlySpan<ByteString> arguments)
{
auto paths = TRY(get_paths_for_helper_process(application));
@ -32,11 +32,11 @@ static ErrorOr<pid_t> launch_process(StringView application, ReadonlySpan<char c
return result;
}
static ErrorOr<pid_t> launch_browser(ByteString const& socket_path, bool force_cpu_painting)
static Vector<ByteString> create_arguments(ByteString const& socket_path, bool force_cpu_painting)
{
auto arguments = Vector {
"--webdriver-content-path",
socket_path.characters(),
Vector<ByteString> arguments {
"--webdriver-content-path"sv,
socket_path,
};
Vector<ByteString> certificate_args;
@ -45,28 +45,26 @@ static ErrorOr<pid_t> launch_browser(ByteString const& socket_path, bool force_c
arguments.append(certificate_args.last().view().characters_without_null_termination());
}
arguments.append("--allow-popups");
arguments.append("--force-new-process");
arguments.append("--enable-autoplay");
arguments.append("--allow-popups"sv);
arguments.append("--force-new-process"sv);
arguments.append("--enable-autoplay"sv);
if (force_cpu_painting)
arguments.append("--force-cpu-painting");
arguments.append("--force-cpu-painting"sv);
arguments.append("about:blank");
arguments.append("about:blank"sv);
return arguments;
}
static ErrorOr<pid_t> launch_browser(ByteString const& socket_path, bool force_cpu_painting)
{
auto arguments = create_arguments(socket_path, force_cpu_painting);
return launch_process("Ladybird"sv, arguments.span());
}
static ErrorOr<pid_t> launch_headless_browser(ByteString const& socket_path)
static ErrorOr<pid_t> launch_headless_browser(ByteString const& socket_path, bool force_cpu_painting)
{
auto resources = ByteString::formatted("{}/res", s_ladybird_resource_root);
return launch_process("headless-browser"sv,
Array {
"--resources",
resources.characters(),
"--webdriver-content-path",
socket_path.characters(),
"about:blank",
});
auto arguments = create_arguments(socket_path, force_cpu_painting);
return launch_process("headless-browser"sv, arguments.span());
}
ErrorOr<int> serenity_main(Main::Arguments arguments)
@ -121,7 +119,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return launch_browser(socket_path, force_cpu_painting);
};
auto maybe_client = WebDriver::Client::try_create(maybe_buffered_socket.release_value(), { move(launch_browser_callback), launch_headless_browser }, server);
auto launch_headless_browser_callback = [&](ByteString const& socket_path) {
return launch_headless_browser(socket_path, force_cpu_painting);
};
auto maybe_client = WebDriver::Client::try_create(maybe_buffered_socket.release_value(), { move(launch_browser_callback), move(launch_headless_browser_callback) }, server);
if (maybe_client.is_error()) {
warnln("Could not create a WebDriver client: {}", maybe_client.error());
return;