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

Update to Chromium revision 66afc5e5 (#540276)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-03-20 16:15:08 -04:00
parent 4fb6e1ba29
commit 7a59914f97
128 changed files with 1921 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libcef/common/task_runner_impl.cc
View File

@ -3,6 +3,7 @@
// 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"
@ -57,26 +58,21 @@ scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
}
// Browser process.
CefContentBrowserClient* client = CefContentBrowserClient::Get();
if (!client)
return NULL;
int id = -1;
switch (threadId) {
case TID_UI:
id = BrowserThread::UI;
break;
case TID_DB:
id = BrowserThread::DB;
break;
case TID_FILE:
id = BrowserThread::FILE;
break;
case TID_FILE_BACKGROUND:
return client->background_task_runner();
case TID_FILE_USER_VISIBLE:
return client->user_visible_task_runner();
case TID_FILE_USER_BLOCKING:
id = BrowserThread::FILE_USER_BLOCKING;
break;
case TID_PROCESS_LAUNCHER:
id = BrowserThread::PROCESS_LAUNCHER;
break;
case TID_CACHE:
id = BrowserThread::CACHE;
break;
return client->user_blocking_task_runner();
case TID_IO:
id = BrowserThread::IO;
break;
@ -84,8 +80,7 @@ scoped_refptr<base::SingleThreadTaskRunner> CefTaskRunnerImpl::GetTaskRunner(
break;
};
if (id >= 0 && CefContentClient::Get() &&
CefContentClient::Get()->browser() &&
if (id >= 0 &&
BrowserThread::IsMessageLoopValid(static_cast<BrowserThread::ID>(id))) {
return BrowserThread::GetTaskRunnerForThread(
static_cast<BrowserThread::ID>(id));