| Index: cc/scheduler/scheduler.h
|
| diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
|
| index f470d17a9e7faa19a53ccacf92ce49e9ca3a2b2b..3e60004e186e9297a5b5fe96ed41e89ed78574a6 100644
|
| --- a/cc/scheduler/scheduler.h
|
| +++ b/cc/scheduler/scheduler.h
|
| @@ -34,7 +34,6 @@ namespace cc {
|
|
|
| class SchedulerClient {
|
| public:
|
| - virtual BeginFrameSource* ExternalBeginFrameSource() = 0;
|
| virtual void WillBeginImplFrame(const BeginFrameArgs& args) = 0;
|
| virtual void ScheduledActionSendBeginMainFrame() = 0;
|
| virtual DrawResult ScheduledActionDrawAndSwapIfPossible() = 0;
|
| @@ -81,13 +80,15 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
|
| const SchedulerSettings& scheduler_settings,
|
| int layer_tree_host_id,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| - base::PowerMonitor* power_monitor) {
|
| + base::PowerMonitor* power_monitor,
|
| + scoped_ptr<BeginFrameSource> external_begin_frame_source) {
|
| SchedulerFrameSourcesConstructor frame_sources_constructor;
|
| return make_scoped_ptr(new Scheduler(client,
|
| scheduler_settings,
|
| layer_tree_host_id,
|
| task_runner,
|
| power_monitor,
|
| + external_begin_frame_source.Pass(),
|
| &frame_sources_constructor));
|
| }
|
|
|
| @@ -173,6 +174,7 @@ class CC_EXPORT Scheduler : public BeginFrameObserverMixIn,
|
| int layer_tree_host_id,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| base::PowerMonitor* power_monitor,
|
| + scoped_ptr<BeginFrameSource> external_begin_frame_source,
|
| SchedulerFrameSourcesConstructor* frame_sources_constructor);
|
|
|
| // virtual for testing - Don't call these in the constructor or
|
|
|