Mozart: Generalize frame scheduling.

services/gfx/compositor/compositor_engine.h

 // Copyright 2015 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 SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_
 #define SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_
 
 #include <unordered_map>
 #include <vector>
 
@@ skipping 39 matching lines @@
   void Update(SceneState* scene_state,
               mojo::gfx::composition::SceneUpdatePtr update);
 
   // Publishes a scene.
   // Destroys |scene_state| if an error occurs.
   void Publish(SceneState* scene_state,
                mojo::gfx::composition::SceneMetadataPtr metadata);
 
   // Schedules a frame callback.
   void ScheduleFrame(SceneState* scene_state,
-                     const SceneFrameCallback& callback);
+                     const FrameCallback& callback);
 
   // RENDERER REQUESTS
 
   // Sets the root scene.
   // Destroys |renderer_state| if an error occurs.
   void SetRootScene(RendererState* renderer_state,
                     mojo::gfx::composition::SceneTokenPtr scene_token,
                     uint32 scene_version,
                     mojo::RectPtr viewport);
 
   // Removes the root scene.
   // Destroys |renderer_state| if an error occurs.
   void ClearRootScene(RendererState* renderer_state);
 
+  // Schedules a frame callback.
+  void ScheduleFrame(RendererState* renderer_state,
+                     const FrameCallback& callback);
+
   // Performs a hit test.
   void HitTest(
       RendererState* renderer_state,
       mojo::PointFPtr point,
       const mojo::gfx::composition::HitTester::HitTestCallback& callback);
 
  private:
   void OnSceneConnectionError(SceneState* scene_state);
   void DestroyScene(SceneState* scene_state);
 
@@ skipping 52 matching lines @@
   Universe universe_;
 
   base::WeakPtrFactory<CompositorEngine> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorEngine);
 };
 
 }  // namespace compositor
 
 #endif  // SERVICES_GFX_COMPOSITOR_COMPOSITOR_H_