Mozart: Generalize frame scheduling.

mojo/ui/choreographer.h

Index: mojo/ui/choreographer.h
diff --git a/mojo/ui/choreographer.h b/mojo/ui/choreographer.h
index 4e0cad55d8706cf0c747a69faa80d42c48844441..a3844fd202dcc3d10bba995647f4b7d8969bcfe2 100644
--- a/mojo/ui/choreographer.h
+++ b/mojo/ui/choreographer.h
@@ -43,13 +43,13 @@ class Choreographer {
  public:
   Choreographer(mojo::gfx::composition::Scene* scene,
                 ChoreographerDelegate* delegate);
-  Choreographer(mojo::gfx::composition::SceneSchedulerPtr scene_scheduler,
+  Choreographer(mojo::gfx::composition::FrameSchedulerPtr frame_scheduler,
                 ChoreographerDelegate* delegate);
   ~Choreographer();
 
   // Gets the scene scheduler.
-  mojo::gfx::composition::SceneScheduler* scene_scheduler() {
-    return scene_scheduler_.get();
+  mojo::gfx::composition::FrameScheduler* frame_scheduler() {
+    return frame_scheduler_.get();
   }
 
   // Gets the frame tracker.
@@ -57,11 +57,11 @@ class Choreographer {
     return frame_tracker_;
   }
 
-  // Schedules a call to the delegate's |OnDraw| using the scene scheduler.
+  // Schedules a call to the delegate's |OnDraw| using the frame scheduler.
   void ScheduleDraw();
 
  private:
-  mojo::gfx::composition::SceneSchedulerPtr scene_scheduler_;
+  mojo::gfx::composition::FrameSchedulerPtr frame_scheduler_;
   ChoreographerDelegate* delegate_;
   mojo::gfx::composition::FrameTracker frame_tracker_;