| Index: content/renderer/scheduler/renderer_web_scheduler_impl.cc
|
| diff --git a/content/renderer/scheduler/web_scheduler_impl.cc b/content/renderer/scheduler/renderer_web_scheduler_impl.cc
|
| similarity index 58%
|
| rename from content/renderer/scheduler/web_scheduler_impl.cc
|
| rename to content/renderer/scheduler/renderer_web_scheduler_impl.cc
|
| index 35988c3b0c0f94e2b1916fd3e2cfcb142eb2728c..1b8a17f13960c8ada1d0c133c77e20b1ec30b5ab 100644
|
| --- a/content/renderer/scheduler/web_scheduler_impl.cc
|
| +++ b/content/renderer/scheduler/renderer_web_scheduler_impl.cc
|
| @@ -1,8 +1,8 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/renderer/scheduler/web_scheduler_impl.h"
|
| +#include "content/renderer/scheduler/renderer_web_scheduler_impl.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/single_thread_task_runner.h"
|
| @@ -11,45 +11,49 @@
|
|
|
| namespace content {
|
|
|
| -WebSchedulerImpl::WebSchedulerImpl(RendererScheduler* renderer_scheduler)
|
| +RendererWebSchedulerImpl::RendererWebSchedulerImpl(
|
| + RendererScheduler* renderer_scheduler)
|
| : renderer_scheduler_(renderer_scheduler),
|
| idle_task_runner_(renderer_scheduler_->IdleTaskRunner()),
|
| loading_task_runner_(renderer_scheduler_->LoadingTaskRunner()),
|
| timer_task_runner_(renderer_scheduler_->TimerTaskRunner()) {
|
| }
|
|
|
| -WebSchedulerImpl::~WebSchedulerImpl() {
|
| +RendererWebSchedulerImpl::~RendererWebSchedulerImpl() {
|
| }
|
|
|
| -bool WebSchedulerImpl::shouldYieldForHighPriorityWork() {
|
| +bool RendererWebSchedulerImpl::shouldYieldForHighPriorityWork() {
|
| return renderer_scheduler_->ShouldYieldForHighPriorityWork();
|
| }
|
|
|
| -bool WebSchedulerImpl::canExceedIdleDeadlineIfRequired() {
|
| +bool RendererWebSchedulerImpl::canExceedIdleDeadlineIfRequired() {
|
| return renderer_scheduler_->CanExceedIdleDeadlineIfRequired();
|
| }
|
|
|
| -void WebSchedulerImpl::runIdleTask(scoped_ptr<blink::WebThread::IdleTask> task,
|
| - base::TimeTicks deadline) {
|
| +void RendererWebSchedulerImpl::runIdleTask(
|
| + scoped_ptr<blink::WebThread::IdleTask> task,
|
| + base::TimeTicks deadline) {
|
| task->run((deadline - base::TimeTicks()).InSecondsF());
|
| }
|
|
|
| -void WebSchedulerImpl::runTask(scoped_ptr<blink::WebThread::Task> task) {
|
| +void RendererWebSchedulerImpl::runTask(
|
| + scoped_ptr<blink::WebThread::Task> task) {
|
| task->run();
|
| }
|
|
|
| -void WebSchedulerImpl::postIdleTask(const blink::WebTraceLocation& web_location,
|
| - blink::WebThread::IdleTask* task) {
|
| +void RendererWebSchedulerImpl::postIdleTask(
|
| + const blink::WebTraceLocation& web_location,
|
| + blink::WebThread::IdleTask* task) {
|
| DCHECK(idle_task_runner_);
|
| scoped_ptr<blink::WebThread::IdleTask> scoped_task(task);
|
| tracked_objects::Location location(web_location.functionName(),
|
| web_location.fileName(), -1, nullptr);
|
| idle_task_runner_->PostIdleTask(
|
| - location,
|
| - base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
|
| + location, base::Bind(&RendererWebSchedulerImpl::runIdleTask,
|
| + base::Passed(&scoped_task)));
|
| }
|
|
|
| -void WebSchedulerImpl::postNonNestableIdleTask(
|
| +void RendererWebSchedulerImpl::postNonNestableIdleTask(
|
| const blink::WebTraceLocation& web_location,
|
| blink::WebThread::IdleTask* task) {
|
| DCHECK(idle_task_runner_);
|
| @@ -57,11 +61,11 @@ void WebSchedulerImpl::postNonNestableIdleTask(
|
| tracked_objects::Location location(web_location.functionName(),
|
| web_location.fileName(), -1, nullptr);
|
| idle_task_runner_->PostNonNestableIdleTask(
|
| - location,
|
| - base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
|
| + location, base::Bind(&RendererWebSchedulerImpl::runIdleTask,
|
| + base::Passed(&scoped_task)));
|
| }
|
|
|
| -void WebSchedulerImpl::postIdleTaskAfterWakeup(
|
| +void RendererWebSchedulerImpl::postIdleTaskAfterWakeup(
|
| const blink::WebTraceLocation& web_location,
|
| blink::WebThread::IdleTask* task) {
|
| DCHECK(idle_task_runner_);
|
| @@ -69,22 +73,23 @@ void WebSchedulerImpl::postIdleTaskAfterWakeup(
|
| tracked_objects::Location location(web_location.functionName(),
|
| web_location.fileName(), -1, nullptr);
|
| idle_task_runner_->PostIdleTaskAfterWakeup(
|
| - location,
|
| - base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
|
| + location, base::Bind(&RendererWebSchedulerImpl::runIdleTask,
|
| + base::Passed(&scoped_task)));
|
| }
|
|
|
| -void WebSchedulerImpl::postLoadingTask(
|
| - const blink::WebTraceLocation& web_location, blink::WebThread::Task* task) {
|
| +void RendererWebSchedulerImpl::postLoadingTask(
|
| + const blink::WebTraceLocation& web_location,
|
| + blink::WebThread::Task* task) {
|
| DCHECK(loading_task_runner_);
|
| scoped_ptr<blink::WebThread::Task> scoped_task(task);
|
| tracked_objects::Location location(web_location.functionName(),
|
| web_location.fileName(), -1, nullptr);
|
| - loading_task_runner_->PostTask(
|
| - location,
|
| - base::Bind(&WebSchedulerImpl::runTask, base::Passed(&scoped_task)));
|
| + loading_task_runner_->PostTask(location,
|
| + base::Bind(&RendererWebSchedulerImpl::runTask,
|
| + base::Passed(&scoped_task)));
|
| }
|
|
|
| -void WebSchedulerImpl::postTimerTask(
|
| +void RendererWebSchedulerImpl::postTimerTask(
|
| const blink::WebTraceLocation& web_location,
|
| blink::WebThread::Task* task,
|
| long long delayMs) {
|
| @@ -93,8 +98,8 @@ void WebSchedulerImpl::postTimerTask(
|
| tracked_objects::Location location(web_location.functionName(),
|
| web_location.fileName(), -1, nullptr);
|
| timer_task_runner_->PostDelayedTask(
|
| - location,
|
| - base::Bind(&WebSchedulerImpl::runTask, base::Passed(&scoped_task)),
|
| + location, base::Bind(&RendererWebSchedulerImpl::runTask,
|
| + base::Passed(&scoped_task)),
|
| base::TimeDelta::FromMilliseconds(delayMs));
|
| }
|
|
|
|
|