diff --git a/Ladybird/AppKit/main.mm b/Ladybird/AppKit/main.mm index 8c4aa5255bf..e6fc7231640 100644 --- a/Ladybird/AppKit/main.mm +++ b/Ladybird/AppKit/main.mm @@ -53,7 +53,7 @@ ErrorOr serenity_main(Main::Arguments arguments) platform_init(); - auto chrome_process = TRY(WebView::ChromeProcess::create()); + WebView::ChromeProcess chrome_process; if (auto const& chrome_options = WebView::Application::chrome_options(); chrome_options.force_new_process == WebView::ForceNewProcess::No) { auto disposition = TRY(chrome_process.connect(chrome_options.raw_urls, chrome_options.new_window)); diff --git a/Ladybird/Qt/main.cpp b/Ladybird/Qt/main.cpp index 9eb34378913..79b5bb9397b 100644 --- a/Ladybird/Qt/main.cpp +++ b/Ladybird/Qt/main.cpp @@ -73,7 +73,7 @@ ErrorOr serenity_main(Main::Arguments arguments) platform_init(); - auto chrome_process = TRY(WebView::ChromeProcess::create()); + WebView::ChromeProcess chrome_process; if (app->chrome_options().force_new_process == WebView::ForceNewProcess::No) { auto disposition = TRY(chrome_process.connect(app->chrome_options().raw_urls, app->chrome_options().new_window)); diff --git a/Userland/Libraries/LibWebView/Application.cpp b/Userland/Libraries/LibWebView/Application.cpp index 78e7b7f187a..04db1d0d6c3 100644 --- a/Userland/Libraries/LibWebView/Application.cpp +++ b/Userland/Libraries/LibWebView/Application.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,10 @@ Application::~Application() void Application::initialize(Main::Arguments const& arguments, URL::URL new_tab_page_url) { + // Increase the open file limit, as the default limits on Linux cause us to run out of file descriptors with around 15 tabs open. + if (auto result = Core::System::set_resource_limits(RLIMIT_NOFILE, 8192); result.is_error()) + warnln("Unable to increase open file limit: {}", result.error()); + Vector raw_urls; Vector certificates; bool new_window = false; diff --git a/Userland/Libraries/LibWebView/ChromeProcess.cpp b/Userland/Libraries/LibWebView/ChromeProcess.cpp index 6d7276ba9c1..c02101fa427 100644 --- a/Userland/Libraries/LibWebView/ChromeProcess.cpp +++ b/Userland/Libraries/LibWebView/ChromeProcess.cpp @@ -25,15 +25,6 @@ private: UIProcessClient(NonnullOwnPtr); }; -ErrorOr ChromeProcess::create() -{ - // Increase the open file limit, as the default limits on Linux cause us to run out of file descriptors with around 15 tabs open. - if (auto result = Core::System::set_resource_limits(RLIMIT_NOFILE, 8192); result.is_error()) - warnln("Unable to increase open file limit: {}", result.error()); - - return ChromeProcess {}; -} - ErrorOr ChromeProcess::connect(Vector const& raw_urls, NewWindow new_window) { static constexpr auto process_name = "Ladybird"sv; diff --git a/Userland/Libraries/LibWebView/ChromeProcess.h b/Userland/Libraries/LibWebView/ChromeProcess.h index 825bad23d3d..3a3b4adaefd 100644 --- a/Userland/Libraries/LibWebView/ChromeProcess.h +++ b/Userland/Libraries/LibWebView/ChromeProcess.h @@ -49,7 +49,7 @@ public: ExitProcess, }; - static ErrorOr create(); + ChromeProcess() = default; ~ChromeProcess(); ErrorOr connect(Vector const& raw_urls, NewWindow new_window); @@ -58,8 +58,6 @@ public: Function const&)> on_new_window; private: - ChromeProcess() = default; - ErrorOr connect_as_client(ByteString const& socket_path, Vector const& raw_urls, NewWindow new_window); ErrorOr connect_as_server(ByteString const& socket_path);