From cc62d33a0705107a17d981ce2807377e2578631a Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Thu, 15 Dec 2022 08:54:51 -0500 Subject: [PATCH] headless-browser: Remove option to specify a WebDriver FD-passing socket --- Userland/Utilities/headless-browser.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index b706e01524..82aaeae03f 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -116,18 +116,6 @@ public: return {}; } - ErrorOr connect_to_webdriver(int webdriver_fd_passing_socket) - { - VERIFY(!m_webdriver); - VERIFY(webdriver_fd_passing_socket >= 0); - - auto socket = TRY(Core::take_over_socket_from_system_server("WebDriver"sv)); - m_webdriver = TRY(WebContent::WebDriverConnection::try_create(move(socket), *this)); - m_webdriver->set_fd_passing_socket(TRY(Core::Stream::LocalSocket::adopt_fd(webdriver_fd_passing_socket))); - - return {}; - } - // ^Web::PageClient virtual bool is_connection_open() const override { @@ -725,7 +713,6 @@ ErrorOr serenity_main(Main::Arguments arguments) StringView error_page_url; StringView ca_certs_path; StringView webdriver_ipc_path; - int webdriver_fd_passing_socket { -1 }; Core::EventLoop event_loop; Core::ArgsParser args_parser; @@ -735,13 +722,9 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.add_option(error_page_url, "URL for the error page (defaults to file:///res/html/error.html)", "error-page", 'e', "error-page-url"); args_parser.add_option(ca_certs_path, "The bundled ca certificates file", "certs", 'c', "ca-certs-path"); args_parser.add_option(webdriver_ipc_path, "Path to the WebDriver IPC socket", "webdriver-ipc-path", 0, "path"); - args_parser.add_option(webdriver_fd_passing_socket, "File descriptor of the passing socket for the WebDriver connection", "webdriver-fd-passing-socket", 'd', "webdriver_fd_passing_socket"); args_parser.add_positional_argument(url, "URL to open", "url", Core::ArgsParser::Required::Yes); args_parser.parse(arguments); - if (!webdriver_ipc_path.is_empty() && webdriver_fd_passing_socket >= 0) - return Error::from_string_view("Only one of --webdriver-ipc-path and --webdriver-fd-passing-socket may be used"sv); - Web::Platform::EventLoopPlugin::install(*new Web::Platform::EventLoopPluginSerenity); Web::Platform::FontPlugin::install(*new Web::Platform::FontPluginSerenity); Web::Platform::ImageCodecPlugin::install(*new ImageCodecPluginHeadless); @@ -788,8 +771,6 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!webdriver_ipc_path.is_empty()) TRY(page_client->connect_to_webdriver(webdriver_ipc_path)); - else if (webdriver_fd_passing_socket >= 0) - TRY(page_client->connect_to_webdriver(webdriver_fd_passing_socket)); else load_page_for_screenshot_and_exit(*page_client, take_screenshot_after);