Commit 6c0dc5d1 authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Commit Bot

Remove WorkerThreadScheduler::default_task_runner_

This CL is a pure refactoring.

Change-Id: Ic3b03be80e1e2e5071c5bfc95e2212214a5af183
Reviewed-on: https://chromium-review.googlesource.com/1094819Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Reviewed-by: default avatarYuta Kitamura <yutak@chromium.org>
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566799}
parent 48f538f4
...@@ -114,10 +114,7 @@ WorkerThreadScheduler::WorkerThreadScheduler( ...@@ -114,10 +114,7 @@ WorkerThreadScheduler::WorkerThreadScheduler(
kUnspecifiedWorkerThreadLoadTrackerReportingInterval), kUnspecifiedWorkerThreadLoadTrackerReportingInterval),
lifecycle_state_(proxy ? proxy->lifecycle_state() lifecycle_state_(proxy ? proxy->lifecycle_state()
: SchedulingLifecycleState::kNotThrottled), : SchedulingLifecycleState::kNotThrottled),
worker_metrics_helper_(thread_type), worker_metrics_helper_(thread_type) {
default_task_runner_(TaskQueueWithTaskType::Create(
helper()->DefaultNonMainThreadTaskQueue(),
TaskType::kWorkerThreadTaskQueueDefault)) {
thread_start_time_ = helper()->NowTicks(); thread_start_time_ = helper()->NowTicks();
load_tracker_.Resume(thread_start_time_); load_tracker_.Resume(thread_start_time_);
helper()->AddTaskTimeObserver(this); helper()->AddTaskTimeObserver(this);
...@@ -145,7 +142,8 @@ WorkerThreadScheduler::~WorkerThreadScheduler() { ...@@ -145,7 +142,8 @@ WorkerThreadScheduler::~WorkerThreadScheduler() {
scoped_refptr<base::SingleThreadTaskRunner> scoped_refptr<base::SingleThreadTaskRunner>
WorkerThreadScheduler::DefaultTaskRunner() { WorkerThreadScheduler::DefaultTaskRunner() {
return default_task_runner_; NOTREACHED();
return nullptr;
} }
scoped_refptr<SingleThreadIdleTaskRunner> scoped_refptr<SingleThreadIdleTaskRunner>
......
...@@ -133,8 +133,6 @@ class PLATFORM_EXPORT WorkerThreadScheduler ...@@ -133,8 +133,6 @@ class PLATFORM_EXPORT WorkerThreadScheduler
WorkerMetricsHelper worker_metrics_helper_; WorkerMetricsHelper worker_metrics_helper_;
scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
// This controller should be initialized before any TraceableVariables // This controller should be initialized before any TraceableVariables
// because they require one to initialize themselves. // because they require one to initialize themselves.
TraceableVariableController traceable_variable_controller_; TraceableVariableController traceable_variable_controller_;
......
...@@ -113,7 +113,7 @@ class WorkerThreadSchedulerTest : public testing::Test { ...@@ -113,7 +113,7 @@ class WorkerThreadSchedulerTest : public testing::Test {
void Init() { void Init() {
scheduler_->Init(); scheduler_->Init();
default_task_runner_ = scheduler_->DefaultTaskRunner(); default_task_runner_ = scheduler_->CreateTaskRunner();
idle_task_runner_ = scheduler_->IdleTaskRunner(); idle_task_runner_ = scheduler_->IdleTaskRunner();
timeline_ = nullptr; timeline_ = nullptr;
} }
...@@ -404,6 +404,6 @@ TEST_F(WorkerThreadSchedulerTest, TestLongIdlePeriodTimeline) { ...@@ -404,6 +404,6 @@ TEST_F(WorkerThreadSchedulerTest, TestLongIdlePeriodTimeline) {
EXPECT_THAT(timeline, ElementsAreArray(expected_timeline)); EXPECT_THAT(timeline, ElementsAreArray(expected_timeline));
} }
} // namespace worker_scheduler_impl_unittest } // namespace worker_thread_scheduler_unittest
} // namespace scheduler } // namespace scheduler
} // namespace blink } // namespace blink
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment