cc: Pass task runner to scheduler

Use explicit task runner to post BeginImplFrameDeadline and
PollForAnticipatedDrawTriggers calls. Removed PostBeginImplFrameDeadline
on the client since it's no longer needed. And fixed up tests.

BUG=348796

Review URL: https://codereview.chromium.org/203233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258326 0039d316-1c4b-4281-b951-d872f2087c98

cc/scheduler/scheduler.cc

@@ -14,12 +14,15 @@
 
 namespace cc {
 
-Scheduler::Scheduler(SchedulerClient* client,
-                     const SchedulerSettings& scheduler_settings,
-                     int layer_tree_host_id)
+Scheduler::Scheduler(
+    SchedulerClient* client,
+    const SchedulerSettings& scheduler_settings,
+    int layer_tree_host_id,
+    const scoped_refptr<base::SequencedTaskRunner>& impl_task_runner)
     : settings_(scheduler_settings),
       client_(client),
       layer_tree_host_id_(layer_tree_host_id),
+      impl_task_runner_(impl_task_runner),
       last_set_needs_begin_impl_frame_(false),
       state_machine_(scheduler_settings),
       inside_process_scheduled_actions_(false),
@@ -178,7 +181,7 @@ void Scheduler::SetupNextBeginImplFrameIfNeeded() {
       poll_for_draw_triggers_closure_.Reset(
           base::Bind(&Scheduler::PollForAnticipatedDrawTriggers,
                      weak_factory_.GetWeakPtr()));
-      base::MessageLoop::current()->PostDelayedTask(
+      impl_task_runner_->PostDelayedTask(
           FROM_HERE,
           poll_for_draw_triggers_closure_.callback(),
           last_begin_impl_frame_args_.interval);
@@ -202,8 +205,8 @@ void Scheduler::SetupNextBeginImplFrameIfNeeded() {
       advance_commit_state_timer_.IsRunning()) {
     if (needs_advance_commit_state_timer &&
         last_begin_impl_frame_args_.IsValid()) {
-    // Since we'd rather get a BeginImplFrame by the normally mechanism, we set
-    // the interval to twice the interval from the previous frame.
+      // Since we'd rather get a BeginImplFrame by the normal mechanism, we
+      // set the interval to twice the interval from the previous frame.
       advance_commit_state_timer_.Start(
           FROM_HERE,
           last_begin_impl_frame_args_.interval * 2,
@@ -281,8 +284,12 @@ void Scheduler::ScheduleBeginImplFrameDeadline(base::TimeTicks deadline) {
   begin_impl_frame_deadline_closure_.Reset(
       base::Bind(&Scheduler::OnBeginImplFrameDeadline,
                  weak_factory_.GetWeakPtr()));
-  client_->PostBeginImplFrameDeadline(
-      begin_impl_frame_deadline_closure_.callback(), deadline);
+
+  base::TimeDelta delta = deadline - gfx::FrameTime::Now();
+  if (delta <= base::TimeDelta())
+    delta = base::TimeDelta();
+  impl_task_runner_->PostDelayedTask(
+      FROM_HERE, begin_impl_frame_deadline_closure_.callback(), delta);
 }
 
 void Scheduler::OnBeginImplFrameDeadline() {

cc/scheduler/scheduler.h

@@ -39,8 +39,6 @@ class SchedulerClient {
   virtual base::TimeDelta DrawDurationEstimate() = 0;
   virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() = 0;
   virtual base::TimeDelta CommitToActivateDurationEstimate() = 0;
-  virtual void PostBeginImplFrameDeadline(const base::Closure& closure,
-                                          base::TimeTicks deadline) = 0;
   virtual void DidBeginImplFrameDeadline() = 0;
 
  protected:
@@ -52,9 +50,10 @@ class CC_EXPORT Scheduler {
   static scoped_ptr<Scheduler> Create(
       SchedulerClient* client,
       const SchedulerSettings& scheduler_settings,
-      int layer_tree_host_id) {
-    return make_scoped_ptr(
-        new Scheduler(client, scheduler_settings, layer_tree_host_id));
+      int layer_tree_host_id,
+      const scoped_refptr<base::SequencedTaskRunner>& impl_task_runner) {
+    return make_scoped_ptr(new Scheduler(
+        client, scheduler_settings, layer_tree_host_id, impl_task_runner));
   }
 
   virtual ~Scheduler();
@@ -99,6 +98,9 @@ class CC_EXPORT Scheduler {
   bool MainThreadIsInHighLatencyMode() const {
     return state_machine_.MainThreadIsInHighLatencyMode();
   }
+  bool BeginImplFrameDeadlinePending() const {
+    return !begin_impl_frame_deadline_closure_.IsCancelled();
+  }
 
   bool WillDrawIfNeeded() const;
 
@@ -123,7 +125,8 @@ class CC_EXPORT Scheduler {
  private:
   Scheduler(SchedulerClient* client,
             const SchedulerSettings& scheduler_settings,
-            int layer_tree_host_id);
+            int layer_tree_host_id,
+            const scoped_refptr<base::SequencedTaskRunner>& impl_task_runner);
 
   base::TimeTicks AdjustedBeginImplFrameDeadline() const;
   void ScheduleBeginImplFrameDeadline(base::TimeTicks deadline);
@@ -142,6 +145,7 @@ class CC_EXPORT Scheduler {
   const SchedulerSettings settings_;
   SchedulerClient* client_;
   int layer_tree_host_id_;
+  scoped_refptr<base::SequencedTaskRunner> impl_task_runner_;
 
   bool last_set_needs_begin_impl_frame_;
   BeginFrameArgs last_begin_impl_frame_args_;