Fixing and enhancing OrderedSimpleTaskRunner to allow 100% deterministic tests.

cc/scheduler/scheduler.h

 // Copyright 2011 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.
 
 #ifndef CC_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/draw_result.h"
 #include "cc/scheduler/scheduler_settings.h"
 #include "cc/scheduler/scheduler_state_machine.h"
+#include "ui/gfx/frame_time.h"

[Sami, 2014/08/19 18:45:04]

Not sure why you needed to add this include here?

[mithro-old, 2014/08/21 17:39:18]

Removed.

 
 namespace base {
 namespace debug {
 class ConvertableToTraceFormat;
 }
 class SingleThreadTaskRunner;
 }
 
 namespace cc {
 
@@ skipping 116 matching lines @@
 
   bool IsBeginMainFrameSent() const;
   void SetContinuousPainting(bool continuous_painting) {
     state_machine_.SetContinuousPainting(continuous_painting);
   }
 
  protected:
   class CC_EXPORT SyntheticBeginFrameSource : public TimeSourceClient {
    public:
     SyntheticBeginFrameSource(Scheduler* scheduler,
-                              base::SingleThreadTaskRunner* task_runner);
+                              scoped_refptr<DelayBasedTimeSource> time_source);
     virtual ~SyntheticBeginFrameSource();
 
     // Updates the phase and frequency of the timer.
     void CommitVSyncParameters(base::TimeTicks timebase,
                                base::TimeDelta interval);
 
     // Activates future BeginFrames and, if activating, pushes the most
     // recently missed BeginFrame to the back of a retroactive queue.
     void SetNeedsBeginFrame(bool needs_begin_frame,
                             std::deque<BeginFrameArgs>* begin_retro_frame_args);
@@ skipping 11 matching lines @@
     Scheduler* scheduler_;
     scoped_refptr<DelayBasedTimeSource> time_source_;
   };
 
   Scheduler(
       SchedulerClient* client,
       const SchedulerSettings& scheduler_settings,
       int layer_tree_host_id,
       const scoped_refptr<base::SingleThreadTaskRunner>& impl_task_runner);
 
+  virtual base::TimeTicks Now() const;

[Sami, 2014/08/19 18:45:04]

bikeshed: I'd prefer a more descriptive name like CurrentFrameTime() or
something to that effect.

[mithro-old, 2014/08/21 17:39:18]

I'm worried it will be to easy to confuse CurrentFrameTime with the
"CurrentFrameTimeToRenderFor".

+
   const SchedulerSettings settings_;
   SchedulerClient* client_;
   int layer_tree_host_id_;
   scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
 
   base::TimeDelta vsync_interval_;
   base::TimeDelta estimated_parent_draw_time_;
 
   bool last_set_needs_begin_frame_;
   bool begin_unthrottled_frame_posted_;
@@ skipping 35 matching lines @@
   void SetupSyntheticBeginFrames();
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_