Commit fbf0aa57 authored by sadrul's avatar sadrul Committed by Commit bot

scheduler: Return a base::SingleThreadTaskRunner for the default task runner.

BUG=none

Review URL: https://codereview.chromium.org/1585723002

Cr-Commit-Position: refs/heads/master@{#369408}
parent a8405987
...@@ -22,8 +22,7 @@ class SCHEDULER_EXPORT ChildScheduler { ...@@ -22,8 +22,7 @@ class SCHEDULER_EXPORT ChildScheduler {
virtual ~ChildScheduler() {} virtual ~ChildScheduler() {}
// Returns the default task runner. // Returns the default task runner.
// TODO(alexclarke): Change this to return a SingleThreadIdleTaskRunner. virtual scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() = 0;
virtual scoped_refptr<TaskQueue> DefaultTaskRunner() = 0;
// Returns the idle task runner. Tasks posted to this runner may be reordered // Returns the idle task runner. Tasks posted to this runner may be reordered
// relative to other task types and may be starved for an arbitrarily long // relative to other task types and may be starved for an arbitrarily long
......
...@@ -17,7 +17,7 @@ WebSchedulerImpl::WebSchedulerImpl( ...@@ -17,7 +17,7 @@ WebSchedulerImpl::WebSchedulerImpl(
ChildScheduler* child_scheduler, ChildScheduler* child_scheduler,
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner, scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner, scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner,
scoped_refptr<TaskQueue> timer_task_runner) scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner)
: child_scheduler_(child_scheduler), : child_scheduler_(child_scheduler),
idle_task_runner_(idle_task_runner), idle_task_runner_(idle_task_runner),
timer_task_runner_(timer_task_runner), timer_task_runner_(timer_task_runner),
......
...@@ -29,7 +29,7 @@ class SCHEDULER_EXPORT WebSchedulerImpl : public blink::WebScheduler { ...@@ -29,7 +29,7 @@ class SCHEDULER_EXPORT WebSchedulerImpl : public blink::WebScheduler {
ChildScheduler* child_scheduler, ChildScheduler* child_scheduler,
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner, scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner, scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner,
scoped_refptr<TaskQueue> timer_task_runner); scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner);
~WebSchedulerImpl() override; ~WebSchedulerImpl() override;
// blink::WebScheduler implementation: // blink::WebScheduler implementation:
...@@ -58,7 +58,7 @@ class SCHEDULER_EXPORT WebSchedulerImpl : public blink::WebScheduler { ...@@ -58,7 +58,7 @@ class SCHEDULER_EXPORT WebSchedulerImpl : public blink::WebScheduler {
ChildScheduler* child_scheduler_; // NOT OWNED ChildScheduler* child_scheduler_; // NOT OWNED
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_; scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_;
scoped_refptr<TaskQueue> timer_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner_;
scoped_ptr<WebTaskRunnerImpl> loading_web_task_runner_; scoped_ptr<WebTaskRunnerImpl> loading_web_task_runner_;
scoped_ptr<WebTaskRunnerImpl> timer_web_task_runner_; scoped_ptr<WebTaskRunnerImpl> timer_web_task_runner_;
}; };
......
...@@ -39,7 +39,8 @@ void WorkerSchedulerImpl::Init() { ...@@ -39,7 +39,8 @@ void WorkerSchedulerImpl::Init() {
idle_helper_.EnableLongIdlePeriod(); idle_helper_.EnableLongIdlePeriod();
} }
scoped_refptr<TaskQueue> WorkerSchedulerImpl::DefaultTaskRunner() { scoped_refptr<base::SingleThreadTaskRunner>
WorkerSchedulerImpl::DefaultTaskRunner() {
DCHECK(initialized_); DCHECK(initialized_);
return helper_.DefaultTaskRunner(); return helper_.DefaultTaskRunner();
} }
......
...@@ -29,7 +29,7 @@ class SCHEDULER_EXPORT WorkerSchedulerImpl : public WorkerScheduler, ...@@ -29,7 +29,7 @@ class SCHEDULER_EXPORT WorkerSchedulerImpl : public WorkerScheduler,
~WorkerSchedulerImpl() override; ~WorkerSchedulerImpl() override;
// WorkerScheduler implementation: // WorkerScheduler implementation:
scoped_refptr<TaskQueue> DefaultTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() override;
scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override; scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override;
bool CanExceedIdleDeadlineIfRequired() const override; bool CanExceedIdleDeadlineIfRequired() const override;
bool ShouldYieldForHighPriorityWork() override; bool ShouldYieldForHighPriorityWork() override;
......
...@@ -155,7 +155,8 @@ scoped_ptr<blink::WebThread> RendererSchedulerImpl::CreateMainThread() { ...@@ -155,7 +155,8 @@ scoped_ptr<blink::WebThread> RendererSchedulerImpl::CreateMainThread() {
return make_scoped_ptr(new WebThreadImplForRendererScheduler(this)); return make_scoped_ptr(new WebThreadImplForRendererScheduler(this));
} }
scoped_refptr<TaskQueue> RendererSchedulerImpl::DefaultTaskRunner() { scoped_refptr<base::SingleThreadTaskRunner>
RendererSchedulerImpl::DefaultTaskRunner() {
return helper_.DefaultTaskRunner(); return helper_.DefaultTaskRunner();
} }
......
...@@ -41,7 +41,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl ...@@ -41,7 +41,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
// RendererScheduler implementation: // RendererScheduler implementation:
scoped_ptr<blink::WebThread> CreateMainThread() override; scoped_ptr<blink::WebThread> CreateMainThread() override;
scoped_refptr<TaskQueue> DefaultTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() override;
scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override; scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner> CompositorTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> CompositorTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner> LoadingTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> LoadingTaskRunner() override;
......
...@@ -18,7 +18,8 @@ scoped_ptr<blink::WebThread> FakeRendererScheduler::CreateMainThread() { ...@@ -18,7 +18,8 @@ scoped_ptr<blink::WebThread> FakeRendererScheduler::CreateMainThread() {
return nullptr; return nullptr;
} }
scoped_refptr<scheduler::TaskQueue> FakeRendererScheduler::DefaultTaskRunner() { scoped_refptr<base::SingleThreadTaskRunner>
FakeRendererScheduler::DefaultTaskRunner() {
return nullptr; return nullptr;
} }
......
...@@ -17,7 +17,7 @@ class FakeRendererScheduler : public scheduler::RendererScheduler { ...@@ -17,7 +17,7 @@ class FakeRendererScheduler : public scheduler::RendererScheduler {
// RendererScheduler implementation. // RendererScheduler implementation.
scoped_ptr<blink::WebThread> CreateMainThread() override; scoped_ptr<blink::WebThread> CreateMainThread() override;
scoped_refptr<scheduler::TaskQueue> DefaultTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner> CompositorTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> CompositorTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner> LoadingTaskRunner() override; scoped_refptr<base::SingleThreadTaskRunner> LoadingTaskRunner() override;
scoped_refptr<scheduler::SingleThreadIdleTaskRunner> IdleTaskRunner() scoped_refptr<scheduler::SingleThreadIdleTaskRunner> IdleTaskRunner()
......
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