Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: headless/lib/browser/headless_browser_impl.cc

Issue 2081423004: headless: Add a dedicated child process entrypoint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneccessary include Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « headless/app/headless_shell.cc ('k') | headless/public/headless_browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: headless/lib/browser/headless_browser_impl.cc
diff --git a/headless/lib/browser/headless_browser_impl.cc b/headless/lib/browser/headless_browser_impl.cc
index dbedf4c2fb23f7fbb1f08f3a0e368681ba66a563..a3eb1ba37406e9ec9a87b979cff65bb23781b0ed 100644
--- a/headless/lib/browser/headless_browser_impl.cc
+++ b/headless/lib/browser/headless_browser_impl.cc
@@ -6,11 +6,13 @@
#include <vector>
+#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "content/public/app/content_main.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_switches.h"
#include "headless/lib/browser/headless_browser_context_impl.h"
#include "headless/lib/browser/headless_browser_main_parts.h"
#include "headless/lib/browser/headless_web_contents_impl.h"
@@ -21,6 +23,26 @@
#include "ui/gfx/geometry/size.h"
namespace headless {
+namespace {
+
+int RunContentMain(
+ HeadlessBrowser::Options options,
+ const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) {
+ content::ContentMainParams params(nullptr);
+ params.argc = options.argc;
+ params.argv = options.argv;
+
+ // TODO(skyostil): Implement custom message pumps.
+ DCHECK(!options.message_pump);
+
+ std::unique_ptr<HeadlessBrowserImpl> browser(
+ new HeadlessBrowserImpl(on_browser_start_callback, std::move(options)));
+ headless::HeadlessContentMainDelegate delegate(std::move(browser));
+ params.delegate = &delegate;
+ return content::ContentMain(params);
+}
+
+} // namespace
HeadlessBrowserImpl::HeadlessBrowserImpl(
const base::Callback<void(HeadlessBrowser*)>& on_start_callback,
@@ -28,7 +50,6 @@ HeadlessBrowserImpl::HeadlessBrowserImpl(
: on_start_callback_(on_start_callback),
options_(std::move(options)),
browser_main_parts_(nullptr) {
- DCHECK(!on_start_callback_.is_null());
}
HeadlessBrowserImpl::~HeadlessBrowserImpl() {}
@@ -141,21 +162,32 @@ void HeadlessBrowserImpl::SetOptionsForTesting(
&options_);
}
+void RunChildProcessIfNeeded(int argc, const char** argv) {
+ base::CommandLine command_line(argc, argv);
+ if (!command_line.HasSwitch(switches::kProcessType))
+ return;
+
+ HeadlessBrowser::Options::Builder builder(argc, argv);
+ exit(RunContentMain(builder.Build(),
+ base::Callback<void(HeadlessBrowser*)>()));
+}
+
int HeadlessBrowserMain(
HeadlessBrowser::Options options,
const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) {
- content::ContentMainParams params(nullptr);
- params.argc = options.argc;
- params.argv = options.argv;
-
- // TODO(skyostil): Implement custom message pumps.
- DCHECK(!options.message_pump);
-
- std::unique_ptr<HeadlessBrowserImpl> browser(
- new HeadlessBrowserImpl(on_browser_start_callback, std::move(options)));
- headless::HeadlessContentMainDelegate delegate(std::move(browser));
- params.delegate = &delegate;
- return content::ContentMain(params);
+ DCHECK(!on_browser_start_callback.is_null());
+#if DCHECK_IS_ON()
+ // The browser can only be initialized once.
+ static bool browser_was_initialized;
+ DCHECK(!browser_was_initialized);
+ browser_was_initialized = true;
+
+ // Child processes should not end up here.
+ base::CommandLine command_line(options.argc, options.argv);
+ DCHECK(!command_line.HasSwitch(switches::kProcessType));
+#endif
+ return RunContentMain(std::move(options),
+ std::move(on_browser_start_callback));
}
} // namespace headless
« no previous file with comments | « headless/app/headless_shell.cc ('k') | headless/public/headless_browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698