mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Add initial chrome runtime support (see issue #2969)
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:
@@ -3,14 +3,13 @@
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "libcef/common/task_runner_impl.h"
|
||||
#include "libcef/browser/content_browser_client.h"
|
||||
#include "libcef/common/content_client.h"
|
||||
#include "libcef/renderer/content_renderer_client.h"
|
||||
#include "libcef/common/task_runner_manager.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/location.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "base/task/post_task.h"
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
@@ -51,17 +50,8 @@ CefTaskRunnerImpl::CefTaskRunnerImpl(
|
||||
// static
|
||||
scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
|
||||
CefThreadId threadId) {
|
||||
// Render process.
|
||||
if (threadId == TID_RENDERER) {
|
||||
CefContentRendererClient* client = CefContentRendererClient::Get();
|
||||
if (client)
|
||||
return client->render_task_runner();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// Browser process.
|
||||
CefContentBrowserClient* client = CefContentBrowserClient::Get();
|
||||
if (!client)
|
||||
auto* manager = CefTaskRunnerManager::Get();
|
||||
if (!manager)
|
||||
return nullptr;
|
||||
|
||||
int id = -1;
|
||||
@@ -70,16 +60,18 @@ scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
|
||||
id = BrowserThread::UI;
|
||||
break;
|
||||
case TID_FILE_BACKGROUND:
|
||||
return client->background_task_runner();
|
||||
return manager->GetBackgroundTaskRunner();
|
||||
case TID_FILE_USER_VISIBLE:
|
||||
return client->user_visible_task_runner();
|
||||
return manager->GetUserVisibleTaskRunner();
|
||||
case TID_FILE_USER_BLOCKING:
|
||||
return client->user_blocking_task_runner();
|
||||
return manager->GetUserBlockingTaskRunner();
|
||||
case TID_PROCESS_LAUNCHER:
|
||||
return content::GetProcessLauncherTaskRunner();
|
||||
case TID_IO:
|
||||
id = BrowserThread::IO;
|
||||
break;
|
||||
case TID_RENDERER:
|
||||
return manager->GetRenderTaskRunner();
|
||||
default:
|
||||
break;
|
||||
};
|
||||
@@ -99,6 +91,10 @@ scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
|
||||
// static
|
||||
scoped_refptr<base::SingleThreadTaskRunner>
|
||||
CefTaskRunnerImpl::GetCurrentTaskRunner() {
|
||||
auto* manager = CefTaskRunnerManager::Get();
|
||||
if (!manager)
|
||||
return nullptr;
|
||||
|
||||
scoped_refptr<base::SingleThreadTaskRunner> task_runner;
|
||||
|
||||
// For named browser process threads return the same TaskRunner as
|
||||
@@ -120,9 +116,7 @@ CefTaskRunnerImpl::GetCurrentTaskRunner() {
|
||||
|
||||
if (!task_runner.get()) {
|
||||
// Check for a WebWorker thread.
|
||||
CefContentRendererClient* client = CefContentRendererClient::Get();
|
||||
if (client)
|
||||
task_runner = client->GetCurrentTaskRunner();
|
||||
return manager->GetWebWorkerTaskRunner();
|
||||
}
|
||||
|
||||
return task_runner;
|
||||
|
Reference in New Issue
Block a user