Chromium Code Reviews| 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 "components/scheduler/renderer/renderer_scheduler.h" | 5 #include "components/scheduler/renderer/renderer_scheduler.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/feature_list.h" | |
| 8 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 9 #include "base/time/default_tick_clock.h" | 10 #include "base/time/default_tick_clock.h" |
| 10 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 11 #include "base/trace_event/trace_event_impl.h" | 12 #include "base/trace_event/trace_event_impl.h" |
| 12 #include "components/scheduler/child/scheduler_tqm_delegate_impl.h" | 13 #include "components/scheduler/child/scheduler_tqm_delegate_impl.h" |
| 13 #include "components/scheduler/child/virtual_time_tqm_delegate.h" | 14 #include "components/scheduler/child/virtual_time_tqm_delegate.h" |
| 14 #include "components/scheduler/common/scheduler_switches.h" | 15 #include "components/scheduler/common/scheduler_switches.h" |
| 15 #include "components/scheduler/renderer/renderer_scheduler_impl.h" | 16 #include "components/scheduler/renderer/renderer_scheduler_impl.h" |
| 16 | 17 |
| 17 namespace scheduler { | 18 namespace scheduler { |
| 19 namespace { | |
| 20 const base::Feature kExpensiveTaskBlockingPolicyFeature{ | |
| 21 "SchedulerExpensiveTaskBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; | |
| 22 } | |
| 18 | 23 |
| 19 RendererScheduler::RendererScheduler() { | 24 RendererScheduler::RendererScheduler() { |
| 20 } | 25 } |
| 21 | 26 |
| 22 RendererScheduler::~RendererScheduler() { | 27 RendererScheduler::~RendererScheduler() { |
| 23 } | 28 } |
| 24 | 29 |
| 25 // static | 30 // static |
| 26 scoped_ptr<RendererScheduler> RendererScheduler::Create() { | 31 scoped_ptr<RendererScheduler> RendererScheduler::Create() { |
| 27 // Ensure worker.scheduler, worker.scheduler.debug and | 32 // Ensure worker.scheduler, worker.scheduler.debug and |
| 28 // renderer.scheduler.debug appear as an option in about://tracing | 33 // renderer.scheduler.debug appear as an option in about://tracing |
| 29 base::trace_event::TraceLog::GetCategoryGroupEnabled( | 34 base::trace_event::TraceLog::GetCategoryGroupEnabled( |
| 30 TRACE_DISABLED_BY_DEFAULT("worker.scheduler")); | 35 TRACE_DISABLED_BY_DEFAULT("worker.scheduler")); |
| 31 base::trace_event::TraceLog::GetCategoryGroupEnabled( | 36 base::trace_event::TraceLog::GetCategoryGroupEnabled( |
| 32 TRACE_DISABLED_BY_DEFAULT("worker.scheduler.debug")); | 37 TRACE_DISABLED_BY_DEFAULT("worker.scheduler.debug")); |
| 33 base::trace_event::TraceLog::GetCategoryGroupEnabled( | 38 base::trace_event::TraceLog::GetCategoryGroupEnabled( |
| 34 TRACE_DISABLED_BY_DEFAULT("renderer.scheduler.debug")); | 39 TRACE_DISABLED_BY_DEFAULT("renderer.scheduler.debug")); |
| 35 | 40 |
| 41 scoped_ptr<RendererSchedulerImpl> scheduler; | |
| 36 base::MessageLoop* message_loop = base::MessageLoop::current(); | 42 base::MessageLoop* message_loop = base::MessageLoop::current(); |
| 37 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 43 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 38 if (command_line->HasSwitch(switches::kEnableVirtualizedTime)) { | 44 if (command_line->HasSwitch(switches::kEnableVirtualizedTime)) { |
| 39 return make_scoped_ptr(new RendererSchedulerImpl( | 45 scheduler.reset(new RendererSchedulerImpl( |
| 40 VirtualTimeTqmDelegate::Create(message_loop, base::TimeTicks::Now()))); | 46 VirtualTimeTqmDelegate::Create(message_loop, base::TimeTicks::Now()))); |
| 41 } else { | 47 } else { |
| 42 return make_scoped_ptr( | 48 scheduler.reset(new RendererSchedulerImpl(SchedulerTqmDelegateImpl::Create( |
| 43 new RendererSchedulerImpl(SchedulerTqmDelegateImpl::Create( | 49 message_loop, make_scoped_ptr(new base::DefaultTickClock())))); |
| 44 message_loop, make_scoped_ptr(new base::DefaultTickClock())))); | |
| 45 } | 50 } |
| 51 | |
| 52 scheduler->SetExpensiveTaskBlockingAllowed( | |
|
alex clarke (OOO till 29th)
2016/01/13 17:18:30
Doesn't have to be this patch but perhaps we might
Sami
2016/01/13 17:25:46
Conveniently this already hooks up to
--enable-fea
| |
| 53 base::FeatureList::IsEnabled(kExpensiveTaskBlockingPolicyFeature)); | |
| 54 return make_scoped_ptr<RendererScheduler>(scheduler.release()); | |
| 46 } | 55 } |
| 47 | 56 |
| 48 // static | 57 // static |
| 49 const char* RendererScheduler::UseCaseToString(UseCase use_case) { | 58 const char* RendererScheduler::UseCaseToString(UseCase use_case) { |
| 50 switch (use_case) { | 59 switch (use_case) { |
| 51 case UseCase::NONE: | 60 case UseCase::NONE: |
| 52 return "none"; | 61 return "none"; |
| 53 case UseCase::COMPOSITOR_GESTURE: | 62 case UseCase::COMPOSITOR_GESTURE: |
| 54 return "compositor_gesture"; | 63 return "compositor_gesture"; |
| 55 case UseCase::MAIN_THREAD_GESTURE: | 64 case UseCase::MAIN_THREAD_GESTURE: |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 74 return "event_consumed_by_compositor"; | 83 return "event_consumed_by_compositor"; |
| 75 case InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD: | 84 case InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD: |
| 76 return "event_forwarded_to_main_thread"; | 85 return "event_forwarded_to_main_thread"; |
| 77 default: | 86 default: |
| 78 NOTREACHED(); | 87 NOTREACHED(); |
| 79 return nullptr; | 88 return nullptr; |
| 80 } | 89 } |
| 81 } | 90 } |
| 82 | 91 |
| 83 } // namespace scheduler | 92 } // namespace scheduler |
| OLD | NEW |