diff --git a/Libraries/LibWebView/ChromeProcess.cpp b/Libraries/LibWebView/BrowserProcess.cpp similarity index 90% rename from Libraries/LibWebView/ChromeProcess.cpp rename to Libraries/LibWebView/BrowserProcess.cpp index 2a64f7203e6..1dfbf761299 100644 --- a/Libraries/LibWebView/ChromeProcess.cpp +++ b/Libraries/LibWebView/BrowserProcess.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace WebView { @@ -25,7 +25,7 @@ private: explicit UIProcessClient(IPC::Transport); }; -ErrorOr ChromeProcess::connect(Vector const& raw_urls, NewWindow new_window) +ErrorOr BrowserProcess::connect(Vector const& raw_urls, NewWindow new_window) { static constexpr auto process_name = "Ladybird"sv; @@ -45,7 +45,7 @@ ErrorOr ChromeProcess::connect(Vector ChromeProcess::connect_as_client(ByteString const& socket_path, Vector const& raw_urls, NewWindow new_window) +ErrorOr BrowserProcess::connect_as_client(ByteString const& socket_path, Vector const& raw_urls, NewWindow new_window) { auto socket = TRY(Core::LocalSocket::connect(socket_path)); static_assert(IsSame, "Need to handle other IPC transports here"); @@ -62,7 +62,7 @@ ErrorOr ChromeProcess::connect_as_client(ByteString const& socket_path, Ve return {}; } -ErrorOr ChromeProcess::connect_as_server(ByteString const& socket_path) +ErrorOr BrowserProcess::connect_as_server(ByteString const& socket_path) { static_assert(IsSame, "Need to handle other IPC transports here"); @@ -88,7 +88,7 @@ ErrorOr ChromeProcess::connect_as_server(ByteString const& socket_path) return {}; } -ChromeProcess::~ChromeProcess() +BrowserProcess::~BrowserProcess() { if (m_pid_file) { MUST(m_pid_file->truncate(0)); diff --git a/Libraries/LibWebView/ChromeProcess.h b/Libraries/LibWebView/BrowserProcess.h similarity index 91% rename from Libraries/LibWebView/ChromeProcess.h rename to Libraries/LibWebView/BrowserProcess.h index e95ed862e54..e12ea842835 100644 --- a/Libraries/LibWebView/ChromeProcess.h +++ b/Libraries/LibWebView/BrowserProcess.h @@ -38,9 +38,9 @@ private: virtual void create_new_window(Vector urls) override; }; -class ChromeProcess { - AK_MAKE_NONCOPYABLE(ChromeProcess); - AK_MAKE_DEFAULT_MOVABLE(ChromeProcess); +class BrowserProcess { + AK_MAKE_NONCOPYABLE(BrowserProcess); + AK_MAKE_DEFAULT_MOVABLE(BrowserProcess); public: enum class ProcessDisposition : u8 { @@ -48,8 +48,8 @@ public: ExitProcess, }; - ChromeProcess() = default; - ~ChromeProcess(); + BrowserProcess() = default; + ~BrowserProcess(); ErrorOr connect(Vector const& raw_urls, NewWindow new_window); diff --git a/Libraries/LibWebView/CMakeLists.txt b/Libraries/LibWebView/CMakeLists.txt index f0c7d7a79c9..a9476ec7276 100644 --- a/Libraries/LibWebView/CMakeLists.txt +++ b/Libraries/LibWebView/CMakeLists.txt @@ -3,7 +3,7 @@ include(fontconfig) set(SOURCES Application.cpp Attribute.cpp - ChromeProcess.cpp + BrowserProcess.cpp ConsoleOutput.cpp CookieJar.cpp Database.cpp diff --git a/UI/AppKit/main.mm b/UI/AppKit/main.mm index d9226e31e1b..93d826b1022 100644 --- a/UI/AppKit/main.mm +++ b/UI/AppKit/main.mm @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,22 +56,22 @@ ErrorOr serenity_main(Main::Arguments arguments) WebView::platform_init(); - WebView::ChromeProcess chrome_process; + WebView::BrowserProcess browser_process; if (auto const& browser_options = WebView::Application::browser_options(); browser_options.force_new_process == WebView::ForceNewProcess::No) { - auto disposition = TRY(chrome_process.connect(browser_options.raw_urls, browser_options.new_window)); + auto disposition = TRY(browser_process.connect(browser_options.raw_urls, browser_options.new_window)); - if (disposition == WebView::ChromeProcess::ProcessDisposition::ExitProcess) { + if (disposition == WebView::BrowserProcess::ProcessDisposition::ExitProcess) { outln("Opening in existing process"); return 0; } } - chrome_process.on_new_tab = [&](auto const& raw_urls) { + browser_process.on_new_tab = [&](auto const& raw_urls) { open_urls_from_client(raw_urls, WebView::NewWindow::No); }; - chrome_process.on_new_window = [&](auto const& raw_urls) { + browser_process.on_new_window = [&](auto const& raw_urls) { open_urls_from_client(raw_urls, WebView::NewWindow::Yes); }; diff --git a/UI/Qt/main.cpp b/UI/Qt/main.cpp index 00feac5909e..2bb63bf03b1 100644 --- a/UI/Qt/main.cpp +++ b/UI/Qt/main.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -82,18 +82,18 @@ ErrorOr serenity_main(Main::Arguments arguments) WebView::platform_init(); - WebView::ChromeProcess chrome_process; + WebView::BrowserProcess browser_process; if (app->browser_options().force_new_process == WebView::ForceNewProcess::No) { - auto disposition = TRY(chrome_process.connect(app->browser_options().raw_urls, app->browser_options().new_window)); + auto disposition = TRY(browser_process.connect(app->browser_options().raw_urls, app->browser_options().new_window)); - if (disposition == WebView::ChromeProcess::ProcessDisposition::ExitProcess) { + if (disposition == WebView::BrowserProcess::ProcessDisposition::ExitProcess) { outln("Opening in existing process"); return 0; } } - chrome_process.on_new_tab = [&](auto const& urls) { + browser_process.on_new_tab = [&](auto const& urls) { auto& window = app->active_window(); for (size_t i = 0; i < urls.size(); ++i) { window.new_tab_from_url(urls[i], (i == 0) ? Web::HTML::ActivateTab::Yes : Web::HTML::ActivateTab::No); @@ -125,7 +125,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(app->launch_services()); - chrome_process.on_new_window = [&](auto const& urls) { + browser_process.on_new_window = [&](auto const& urls) { app->new_window(urls); };