| Index: content/renderer/render_process_impl.cc
|
| diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
|
| index 824306e77ba5b22ced1b19abc68b8f996706c0b6..9676cbb91840552f6bf1620c38b166bfa7942926 100644
|
| --- a/content/renderer/render_process_impl.cc
|
| +++ b/content/renderer/render_process_impl.cc
|
| @@ -15,17 +15,16 @@
|
| #include <stddef.h>
|
|
|
| #include <algorithm>
|
| -#include <vector>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/debug/crash_logging.h"
|
| #include "base/feature_list.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/sys_info.h"
|
| #include "base/task_scheduler/initialization_util.h"
|
| -#include "base/task_scheduler/scheduler_worker_pool_params.h"
|
| -#include "base/task_scheduler/task_scheduler.h"
|
| #include "base/task_scheduler/task_traits.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "base/time/time.h"
|
| @@ -132,8 +131,13 @@ size_t DefaultRendererWorkerPoolIndexForTraits(const base::TaskTraits& traits) {
|
|
|
| namespace content {
|
|
|
| -RenderProcessImpl::RenderProcessImpl()
|
| - : enabled_bindings_(0) {
|
| +RenderProcessImpl::RenderProcessImpl(
|
| + const std::vector<base::SchedulerWorkerPoolParams>& worker_pool_params,
|
| + base::TaskScheduler::WorkerPoolIndexForTraitsCallback
|
| + worker_pool_index_for_traits_callback)
|
| + : RenderProcess(worker_pool_params,
|
| + std::move(worker_pool_index_for_traits_callback)),
|
| + enabled_bindings_(0) {
|
| #if defined(OS_WIN)
|
| // Record whether the machine is domain joined in a crash key. This will be
|
| // used to better identify whether crashes are from enterprise users.
|
| @@ -206,30 +210,33 @@ RenderProcessImpl::~RenderProcessImpl() {
|
| GetShutDownEvent()->Signal();
|
| }
|
|
|
| -void RenderProcessImpl::AddBindings(int bindings) {
|
| - enabled_bindings_ |= bindings;
|
| -}
|
| -
|
| -int RenderProcessImpl::GetEnabledBindings() const {
|
| - return enabled_bindings_;
|
| -}
|
| -
|
| -void RenderProcessImpl::InitializeTaskScheduler() {
|
| - std::vector<base::SchedulerWorkerPoolParams> params_vector;
|
| +std::unique_ptr<RenderProcess> RenderProcessImpl::Create() {
|
| + std::vector<base::SchedulerWorkerPoolParams> worker_pool_params_vector;
|
| base::TaskScheduler::WorkerPoolIndexForTraitsCallback
|
| - index_to_traits_callback;
|
| + worker_pool_index_for_traits_callback;
|
| content::GetContentClient()->renderer()->GetTaskSchedulerInitializationParams(
|
| - ¶ms_vector, &index_to_traits_callback);
|
| + &worker_pool_params_vector, &worker_pool_index_for_traits_callback);
|
|
|
| - if (params_vector.empty()) {
|
| - params_vector = GetDefaultSchedulerWorkerPoolParams();
|
| - index_to_traits_callback =
|
| + if (worker_pool_params_vector.empty()) {
|
| + worker_pool_params_vector = GetDefaultSchedulerWorkerPoolParams();
|
| + worker_pool_index_for_traits_callback =
|
| base::Bind(&DefaultRendererWorkerPoolIndexForTraits);
|
| }
|
| - DCHECK(index_to_traits_callback);
|
|
|
| - base::TaskScheduler::CreateAndSetDefaultTaskScheduler(
|
| - params_vector, index_to_traits_callback);
|
| + DCHECK(!worker_pool_params_vector.empty());
|
| + DCHECK(worker_pool_index_for_traits_callback);
|
| +
|
| + return base::WrapUnique(
|
| + new RenderProcessImpl(worker_pool_params_vector,
|
| + std::move(worker_pool_index_for_traits_callback)));
|
| +}
|
| +
|
| +void RenderProcessImpl::AddBindings(int bindings) {
|
| + enabled_bindings_ |= bindings;
|
| +}
|
| +
|
| +int RenderProcessImpl::GetEnabledBindings() const {
|
| + return enabled_bindings_;
|
| }
|
|
|
| } // namespace content
|
|
|