Index: components/task_scheduler_util/renderer/initialization.cc |
diff --git a/components/task_scheduler_util/renderer/initialization.cc b/components/task_scheduler_util/renderer/initialization.cc |
index 0bef44603c623aabd0da6423fe738b48adf8ac2b..a567a6b80136b3155e3c6380f4da841e78e9bb10 100644 |
--- a/components/task_scheduler_util/renderer/initialization.cc |
+++ b/components/task_scheduler_util/renderer/initialization.cc |
@@ -4,13 +4,9 @@ |
#include "components/task_scheduler_util/renderer/initialization.h" |
-#include <map> |
-#include <string> |
- |
#include "base/command_line.h" |
-#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/task_scheduler/task_traits.h" |
-#include "base/threading/platform_thread.h" |
#include "components/task_scheduler_util/common/variations_util.h" |
namespace task_scheduler_util { |
@@ -27,24 +23,42 @@ enum WorkerPoolType : size_t { |
} // namespace |
+std::unique_ptr<base::TaskScheduler::InitParams> |
+GetRendererTaskSchedulerInitParamsFromCommandLine() { |
+ auto variation_params = GetVariationParamsFromCommandLine( |
+ *base::CommandLine::ForCurrentProcess()); |
+ |
+ const auto background_worker_pool_params = |
+ StringToWorkerPoolParams(variation_params["RendererBackground"]); |
+ const auto background_blocking_worker_pool_params = |
+ StringToWorkerPoolParams(variation_params["RendererBackgroundBlocking"]); |
+ const auto foreground_worker_pool_params = |
+ StringToWorkerPoolParams(variation_params["RendererForeground"]); |
+ const auto foreground_blocking_worker_pool_params = |
+ StringToWorkerPoolParams(variation_params["RendererForegroundBlocking"]); |
+ |
+ if (!background_worker_pool_params || |
+ !background_blocking_worker_pool_params || |
+ !foreground_worker_pool_params || |
+ !foreground_blocking_worker_pool_params) { |
+ return nullptr; |
+ } |
+ |
+ return base::MakeUnique<base::TaskScheduler::InitParams>( |
+ *background_worker_pool_params, *background_blocking_worker_pool_params, |
+ *foreground_worker_pool_params, *foreground_blocking_worker_pool_params); |
+} |
+ |
std::vector<base::SchedulerWorkerPoolParams> GetRendererWorkerPoolParams() { |
- using ThreadPriority = base::ThreadPriority; |
- std::vector<SchedulerImmutableWorkerPoolParams> immutable_worker_pool_params; |
- DCHECK_EQ(BACKGROUND, immutable_worker_pool_params.size()); |
- immutable_worker_pool_params.emplace_back("RendererBackground", |
- ThreadPriority::BACKGROUND); |
- DCHECK_EQ(BACKGROUND_BLOCKING, immutable_worker_pool_params.size()); |
- immutable_worker_pool_params.emplace_back("RendererBackgroundBlocking", |
- ThreadPriority::BACKGROUND); |
- DCHECK_EQ(FOREGROUND, immutable_worker_pool_params.size()); |
- immutable_worker_pool_params.emplace_back("RendererForeground", |
- ThreadPriority::NORMAL); |
- DCHECK_EQ(FOREGROUND_BLOCKING, immutable_worker_pool_params.size()); |
- immutable_worker_pool_params.emplace_back("RendererForegroundBlocking", |
- ThreadPriority::NORMAL); |
- return GetWorkerPoolParams(immutable_worker_pool_params, |
- GetVariationParamsFromCommandLine( |
- *base::CommandLine::ForCurrentProcess())); |
+ const auto init_params = GetRendererTaskSchedulerInitParamsFromCommandLine(); |
+ if (!init_params) |
+ return std::vector<base::SchedulerWorkerPoolParams>(); |
+ |
+ return std::vector<base::SchedulerWorkerPoolParams>{ |
+ init_params->background_worker_pool_params, |
+ init_params->background_blocking_worker_pool_params, |
+ init_params->foreground_worker_pool_params, |
+ init_params->foreground_blocking_worker_pool_params}; |
} |
size_t RendererWorkerPoolIndexForTraits(const base::TaskTraits& traits) { |