bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add initial chrome runtime support (see issue #2969)

Browse Source 
Running `cefsimple --enable-chrome-runtime` will create and run a
Chrome browser window using the CEF app methods, and call
CefApp::OnContextInitialized as expected. CEF task methods also
work as expected in the main process. No browser-related methods or
callbacks are currently supported for the Chrome window, and the
application will exit when the last Chrome window closes.

The Chrome runtime requires resources.pak, chrome_100_percent.pak
and chrome_200_percent.pak files which were not previously built
with CEF. It shares the existing locales pak files which have been
updated to include additional Chrome-specific strings.

On Linux, the Chrome runtime requires GTK so use_gtk=true must be
specified via GN_DEFINES when building.

This change also refactors the CEF runtime, which can be tested in
the various supported modes by running:
$ cefclient
$ cefclient --multi-threaded-message-loop
$ cefclient --external-message-pump
This commit is contained in:
Marshall Greenblatt
2020-06-24 22:34:12 -04:00
parent 049caf9131
commit 1174994211
37 changed files with 994 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libcef/browser/main_runner.h
View File

@@ -7,9 +7,11 @@
#define CEF_LIBCEF_BROWSER_MAIN_RUNNER_H_
#pragma once
#include "libcef/common/main_delegate.h"
#include "include/cef_app.h"
#include "libcef/common/main_runner_delegate.h"
#include "libcef/common/main_runner_handler.h"
#include "base/callback_forward.h"
#include "base/callback.h"
#include "base/macros.h"
#include "content/public/browser/browser_main_runner.h"
@@ -30,7 +32,7 @@ struct MainParams;
class CefUIThread;
// Manages the main process lifespan and related objects.
class CefMainRunner : public CefMainDelegate::Runner {
class CefMainRunner : public CefMainRunnerHandler {
public:
CefMainRunner(bool multi_threaded_message_loop, bool external_message_pump);
~CefMainRunner();
@@ -47,7 +49,8 @@ class CefMainRunner : public CefMainDelegate::Runner {
void Shutdown(base::OnceClosure shutdown_on_ui_thread,
base::OnceClosure finalize_shutdown);
bool IsCefRuntime() const { return runtime_type_ == RuntimeType::CEF; }
void RunMessageLoop();
void QuitMessageLoop();
// Called from CefExecuteProcess.
static int RunAsHelperProcess(const CefMainArgs& args,
@@ -56,13 +59,12 @@ class CefMainRunner : public CefMainDelegate::Runner {
private:
// Called from Initialize().
void CefRuntimeInitialize(CefSettings* settings, CefRefPtr<CefApp> app);
int ContentMainInitialize(const CefMainArgs& args,
void* windows_sandbox_info,
int* no_sandbox);
bool ContentMainRun(bool* initialized, base::OnceClosure context_initialized);
// CefMainDelegate::Runner methods:
// CefMainRunnerHandler methods:
void PreCreateMainMessageLoop() override;
int RunMainProcess(
const content::MainFunctionParams& main_function_params) override;
@@ -84,19 +86,16 @@ class CefMainRunner : public CefMainDelegate::Runner {
const bool multi_threaded_message_loop_;
const bool external_message_pump_;
enum class RuntimeType {
UNINITIALIZED,
CEF,
};
RuntimeType runtime_type_ = RuntimeType::UNINITIALIZED;
std::unique_ptr<content::ContentMainDelegate> main_delegate_;
std::unique_ptr<CefMainRunnerDelegate> main_delegate_;
std::unique_ptr<content::ContentServiceManagerMainDelegate> sm_main_delegate_;
std::unique_ptr<service_manager::MainParams> sm_main_params_;
std::unique_ptr<content::BrowserMainRunner> browser_runner_;
std::unique_ptr<CefUIThread> ui_thread_;
// Used to quit the current base::RunLoop.
base::OnceClosure quit_when_idle_callback_;
DISALLOW_COPY_AND_ASSIGN(CefMainRunner);
};