| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/scheduler/renderer_scheduler_impl.h" | 5 #include "content/renderer/scheduler/renderer_scheduler_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "base/trace_event/trace_event_argument.h" | 10 #include "base/trace_event/trace_event_argument.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 end_idle_period_closure_.Reset(base::Bind( | 38 end_idle_period_closure_.Reset(base::Bind( |
| 39 &RendererSchedulerImpl::EndIdlePeriod, weak_renderer_scheduler_ptr_)); | 39 &RendererSchedulerImpl::EndIdlePeriod, weak_renderer_scheduler_ptr_)); |
| 40 idle_task_runner_ = make_scoped_refptr(new SingleThreadIdleTaskRunner( | 40 idle_task_runner_ = make_scoped_refptr(new SingleThreadIdleTaskRunner( |
| 41 task_queue_manager_->TaskRunnerForQueue(IDLE_TASK_QUEUE), | 41 task_queue_manager_->TaskRunnerForQueue(IDLE_TASK_QUEUE), |
| 42 base::Bind(&RendererSchedulerImpl::CurrentIdleTaskDeadlineCallback, | 42 base::Bind(&RendererSchedulerImpl::CurrentIdleTaskDeadlineCallback, |
| 43 weak_renderer_scheduler_ptr_))); | 43 weak_renderer_scheduler_ptr_))); |
| 44 renderer_task_queue_selector_->SetQueuePriority( | 44 renderer_task_queue_selector_->SetQueuePriority( |
| 45 CONTROL_TASK_QUEUE, RendererTaskQueueSelector::CONTROL_PRIORITY); | 45 CONTROL_TASK_QUEUE, RendererTaskQueueSelector::CONTROL_PRIORITY); |
| 46 renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); | 46 renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
| 47 task_queue_manager_->SetAutoPump(IDLE_TASK_QUEUE, false); | 47 task_queue_manager_->SetAutoPump(IDLE_TASK_QUEUE, false); |
| 48 // TODO(skyostil): Increase this to 4 (crbug.com/444764). | |
| 49 task_queue_manager_->SetWorkBatchSize(1); | |
| 50 | 48 |
| 51 for (size_t i = 0; i < TASK_QUEUE_COUNT; i++) { | 49 for (size_t i = 0; i < TASK_QUEUE_COUNT; i++) { |
| 52 task_queue_manager_->SetQueueName( | 50 task_queue_manager_->SetQueueName( |
| 53 i, TaskQueueIdToString(static_cast<QueueId>(i))); | 51 i, TaskQueueIdToString(static_cast<QueueId>(i))); |
| 54 } | 52 } |
| 55 TRACE_EVENT_OBJECT_CREATED_WITH_ID( | 53 TRACE_EVENT_OBJECT_CREATED_WITH_ID( |
| 56 TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), "RendererScheduler", | 54 TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), "RendererScheduler", |
| 57 this); | 55 this); |
| 58 } | 56 } |
| 59 | 57 |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 } | 248 } |
| 251 | 249 |
| 252 void RendererSchedulerImpl::EndIdlePeriod() { | 250 void RendererSchedulerImpl::EndIdlePeriod() { |
| 253 TRACE_EVENT_ASYNC_END0("renderer.scheduler", | 251 TRACE_EVENT_ASYNC_END0("renderer.scheduler", |
| 254 "RendererSchedulerIdlePeriod", this); | 252 "RendererSchedulerIdlePeriod", this); |
| 255 main_thread_checker_.CalledOnValidThread(); | 253 main_thread_checker_.CalledOnValidThread(); |
| 256 end_idle_period_closure_.Cancel(); | 254 end_idle_period_closure_.Cancel(); |
| 257 renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); | 255 renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
| 258 } | 256 } |
| 259 | 257 |
| 260 void RendererSchedulerImpl::SetTimeSourceForTesting( | |
| 261 scoped_refptr<cc::TestNowSource> time_source) { | |
| 262 main_thread_checker_.CalledOnValidThread(); | |
| 263 time_source_ = time_source; | |
| 264 task_queue_manager_->SetTimeSourceForTesting(time_source); | |
| 265 } | |
| 266 | |
| 267 base::TimeTicks RendererSchedulerImpl::Now() const { | 258 base::TimeTicks RendererSchedulerImpl::Now() const { |
| 268 return UNLIKELY(time_source_) ? time_source_->Now() : base::TimeTicks::Now(); | 259 return gfx::FrameTime::Now(); |
| 269 } | 260 } |
| 270 | 261 |
| 271 RendererSchedulerImpl::PollableNeedsUpdateFlag::PollableNeedsUpdateFlag( | 262 RendererSchedulerImpl::PollableNeedsUpdateFlag::PollableNeedsUpdateFlag( |
| 272 base::Lock* write_lock_) | 263 base::Lock* write_lock_) |
| 273 : flag_(false), write_lock_(write_lock_) { | 264 : flag_(false), write_lock_(write_lock_) { |
| 274 } | 265 } |
| 275 | 266 |
| 276 RendererSchedulerImpl::PollableNeedsUpdateFlag::~PollableNeedsUpdateFlag() { | 267 RendererSchedulerImpl::PollableNeedsUpdateFlag::~PollableNeedsUpdateFlag() { |
| 277 } | 268 } |
| 278 | 269 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 state->SetDouble("last_input_time", | 324 state->SetDouble("last_input_time", |
| 334 (last_input_time_ - base::TimeTicks()).InMillisecondsF()); | 325 (last_input_time_ - base::TimeTicks()).InMillisecondsF()); |
| 335 state->SetDouble( | 326 state->SetDouble( |
| 336 "estimated_next_frame_begin", | 327 "estimated_next_frame_begin", |
| 337 (estimated_next_frame_begin_ - base::TimeTicks()).InMillisecondsF()); | 328 (estimated_next_frame_begin_ - base::TimeTicks()).InMillisecondsF()); |
| 338 | 329 |
| 339 return state; | 330 return state; |
| 340 } | 331 } |
| 341 | 332 |
| 342 } // namespace content | 333 } // namespace content |
| OLD | NEW |