Commit ae910bcc authored by Yuta Kitamura's avatar Yuta Kitamura Committed by Commit Bot

Rename ChildScheduler to WebThreadScheduler.

Scheduler classes are being renamed as part of scheduler
architecture refactoring.

Bug: 826203
Change-Id: I1f59849cdb83bbc861cc3110b87d4f0bec901761
Reviewed-on: https://chromium-review.googlesource.com/989528Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547756}
parent a9e005a0
...@@ -17,10 +17,10 @@ namespace scheduler { ...@@ -17,10 +17,10 @@ namespace scheduler {
// TODO(kraynov): Ditch kDeprecatedNone here. // TODO(kraynov): Ditch kDeprecatedNone here.
WebSchedulerImpl::WebSchedulerImpl( WebSchedulerImpl::WebSchedulerImpl(
ChildScheduler* child_scheduler, WebThreadScheduler* thread_scheduler,
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner, scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner,
scoped_refptr<TaskQueue> v8_task_runner) scoped_refptr<TaskQueue> v8_task_runner)
: child_scheduler_(child_scheduler), : thread_scheduler_(thread_scheduler),
idle_task_runner_(idle_task_runner), idle_task_runner_(idle_task_runner),
v8_task_runner_(TaskRunnerImpl::Create(std::move(v8_task_runner), v8_task_runner_(TaskRunnerImpl::Create(std::move(v8_task_runner),
TaskType::kDeprecatedNone)) {} TaskType::kDeprecatedNone)) {}
...@@ -28,15 +28,15 @@ WebSchedulerImpl::WebSchedulerImpl( ...@@ -28,15 +28,15 @@ WebSchedulerImpl::WebSchedulerImpl(
WebSchedulerImpl::~WebSchedulerImpl() = default; WebSchedulerImpl::~WebSchedulerImpl() = default;
void WebSchedulerImpl::Shutdown() { void WebSchedulerImpl::Shutdown() {
child_scheduler_->Shutdown(); thread_scheduler_->Shutdown();
} }
bool WebSchedulerImpl::ShouldYieldForHighPriorityWork() { bool WebSchedulerImpl::ShouldYieldForHighPriorityWork() {
return child_scheduler_->ShouldYieldForHighPriorityWork(); return thread_scheduler_->ShouldYieldForHighPriorityWork();
} }
bool WebSchedulerImpl::CanExceedIdleDeadlineIfRequired() { bool WebSchedulerImpl::CanExceedIdleDeadlineIfRequired() {
return child_scheduler_->CanExceedIdleDeadlineIfRequired(); return thread_scheduler_->CanExceedIdleDeadlineIfRequired();
} }
void WebSchedulerImpl::RunIdleTask(blink::WebThread::IdleTask task, void WebSchedulerImpl::RunIdleTask(blink::WebThread::IdleTask task,
......
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
namespace blink { namespace blink {
namespace scheduler { namespace scheduler {
class ChildScheduler;
class SingleThreadIdleTaskRunner; class SingleThreadIdleTaskRunner;
class TaskRunnerImpl; class TaskRunnerImpl;
class WebThreadScheduler;
class PLATFORM_EXPORT WebSchedulerImpl : public WebScheduler { class PLATFORM_EXPORT WebSchedulerImpl : public WebScheduler {
public: public:
WebSchedulerImpl(ChildScheduler* child_scheduler, WebSchedulerImpl(WebThreadScheduler* thread_scheduler,
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner, scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner,
scoped_refptr<TaskQueue> v8_task_runner); scoped_refptr<TaskQueue> v8_task_runner);
~WebSchedulerImpl() override; ~WebSchedulerImpl() override;
...@@ -54,7 +54,7 @@ class PLATFORM_EXPORT WebSchedulerImpl : public WebScheduler { ...@@ -54,7 +54,7 @@ class PLATFORM_EXPORT WebSchedulerImpl : public WebScheduler {
private: private:
static void RunIdleTask(WebThread::IdleTask task, base::TimeTicks deadline); static void RunIdleTask(WebThread::IdleTask task, base::TimeTicks deadline);
ChildScheduler* child_scheduler_; // NOT OWNED WebThreadScheduler* thread_scheduler_; // NOT OWNED
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_; scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_;
scoped_refptr<TaskRunnerImpl> v8_task_runner_; scoped_refptr<TaskRunnerImpl> v8_task_runner_;
......
...@@ -22,7 +22,7 @@ namespace scheduler { ...@@ -22,7 +22,7 @@ namespace scheduler {
class WorkerSchedulerProxy; class WorkerSchedulerProxy;
// TODO(yutak): Rename this class to NonMainThreadScheduler. // TODO(yutak): Rename this class to NonMainThreadScheduler.
class PLATFORM_EXPORT WorkerScheduler : public ChildScheduler { class PLATFORM_EXPORT WorkerScheduler : public WebThreadScheduler {
public: public:
~WorkerScheduler() override; ~WorkerScheduler() override;
......
...@@ -44,7 +44,7 @@ enum class RendererProcessType; ...@@ -44,7 +44,7 @@ enum class RendererProcessType;
class RenderWidgetSchedulingState; class RenderWidgetSchedulingState;
// TODO(yutak): Rename this class to WebMainThreadScheduler. // TODO(yutak): Rename this class to WebMainThreadScheduler.
class BLINK_PLATFORM_EXPORT RendererScheduler : public ChildScheduler { class BLINK_PLATFORM_EXPORT RendererScheduler : public WebThreadScheduler {
public: public:
class BLINK_PLATFORM_EXPORT RAILModeObserver { class BLINK_PLATFORM_EXPORT RAILModeObserver {
public: public:
......
...@@ -18,10 +18,9 @@ class MessageLoop; ...@@ -18,10 +18,9 @@ class MessageLoop;
namespace blink { namespace blink {
namespace scheduler { namespace scheduler {
// TODO(yutak): Rename this class to WebThreadScheduler. class BLINK_PLATFORM_EXPORT WebThreadScheduler {
class BLINK_PLATFORM_EXPORT ChildScheduler {
public: public:
virtual ~ChildScheduler() = default; virtual ~WebThreadScheduler() = default;
// Returns the default task runner. // Returns the default task runner.
virtual scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() = 0; virtual scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() = 0;
...@@ -64,8 +63,8 @@ class BLINK_PLATFORM_EXPORT ChildScheduler { ...@@ -64,8 +63,8 @@ class BLINK_PLATFORM_EXPORT ChildScheduler {
virtual void Shutdown() = 0; virtual void Shutdown() = 0;
protected: protected:
ChildScheduler() = default; WebThreadScheduler() = default;
DISALLOW_COPY_AND_ASSIGN(ChildScheduler); DISALLOW_COPY_AND_ASSIGN(WebThreadScheduler);
}; };
} // namespace scheduler } // namespace scheduler
......
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