mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-20 17:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Ladybird: Spawn ladybird and headless-browser using helpers in WebDriver

Browse source 
This allows the WebDriver to take advantage of the common helper process
spawning code when launching ladybird, and to not assume a particular
directory layout.
This commit is contained in:
Andrew Kaster 2023-02-02 03:41:47 -07:00 • committed by Andrew Kaster
parent 0d5d3f12e2
commit 7598a99ef3
Notes: sideshowbarker 2024-07-17 03:35:24 +09:00
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ladybird/WebDriver/CMakeLists.txt
View file

@ -5,6 +5,7 @@ set(SOURCES
${WEBDRIVER_SOURCE_DIR}/Session.cpp ${WEBDRIVER_SOURCE_DIR}/Session.cpp
${WEBDRIVER_SOURCE_DIR}/WebContentConnection.cpp ${WEBDRIVER_SOURCE_DIR}/WebContentConnection.cpp
../Utilities.cpp ../Utilities.cpp
../HelperProcess.cpp
main.cpp main.cpp
) )

24
Ladybird/WebDriver/main.cpp
View file

@ -6,6 +6,7 @@
#define AK_DONT_REPLACE_STD #define AK_DONT_REPLACE_STD
#include "../HelperProcess.h"
#include "../Utilities.h" #include "../Utilities.h"
#include <AK/Platform.h> #include <AK/Platform.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
@ -15,6 +16,7 @@
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibCore/TCPServer.h> #include <LibCore/TCPServer.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <QCoreApplication>
#include <WebDriver/Client.h> #include <WebDriver/Client.h>
#if defined(AK_OS_MACOS) #if defined(AK_OS_MACOS)
@ -33,6 +35,21 @@ static char** environment()
#endif #endif
} }
static ErrorOr<pid_t> launch_process(StringView application, char const* argv[])
{
auto paths = TRY(get_paths_for_helper_process(application));
ErrorOr<pid_t> result = -1;
for (auto const& path : paths) {
auto path_view = path.bytes_as_string_view();
argv[0] = path_view.characters_without_null_termination();
result = Core::System::posix_spawn(path_view, nullptr, nullptr, const_cast<char**>(argv), environment());
if (!result.is_error())
break;
}
return result;
}
static ErrorOr<pid_t> launch_browser(DeprecatedString const& socket_path) static ErrorOr<pid_t> launch_browser(DeprecatedString const& socket_path)
{ {
char const* argv[] = { char const* argv[] = {
@ -42,7 +59,7 @@ static ErrorOr<pid_t> launch_browser(DeprecatedString const& socket_path)
nullptr, nullptr,
}; };
return Core::System::posix_spawn("./ladybird"sv, nullptr, nullptr, const_cast<char**>(argv), environment()); return launch_process("ladybird"sv, argv);
} }
static ErrorOr<pid_t> launch_headless_browser(DeprecatedString const& socket_path) static ErrorOr<pid_t> launch_headless_browser(DeprecatedString const& socket_path)
@ -65,11 +82,14 @@ static ErrorOr<pid_t> launch_headless_browser(DeprecatedString const& socket_pat
nullptr, nullptr,
}; };
return Core::System::posix_spawn("./_deps/lagom-build/headless-browser"sv, nullptr, nullptr, const_cast<char**>(argv), environment()); return launch_process("headless-browser"sv, argv);
} }
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
// Note: only creating this to get access to its static methods in HelperProcess
QCoreApplication application(arguments.argc, arguments.argv);
auto listen_address = "0.0.0.0"sv; auto listen_address = "0.0.0.0"sv;
int port = 8000; int port = 8000;