Hook up ui::Compositor to Display's BeginFrameSource

cc/surfaces/onscreen_display_client.h

Index: cc/surfaces/onscreen_display_client.h
diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h
index d91f9c4908c68933a2aaeb75f7bf8f3aa4aa2136..6fa0e8d711c2b7ee68125395c68bfd44a1b0af77 100644
--- a/cc/surfaces/onscreen_display_client.h
+++ b/cc/surfaces/onscreen_display_client.h
@@ -19,7 +19,6 @@ class SingleThreadTaskRunner;
 }
 
 namespace cc {
-class BeginFrameSource;
 class ContextProvider;
 class DisplayScheduler;
 class SurfaceManager;
@@ -30,13 +29,13 @@ class SurfaceDisplayOutputSurface;
 class CC_SURFACES_EXPORT OnscreenDisplayClient
     : NON_EXPORTED_BASE(DisplayClient) {
  public:
-  OnscreenDisplayClient(
-      scoped_ptr<OutputSurface> output_surface,
-      SurfaceManager* manager,
-      SharedBitmapManager* bitmap_manager,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      const RendererSettings& settings,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner);
+  OnscreenDisplayClient(scoped_ptr<OutputSurface> output_surface,
+                        SurfaceManager* manager,
+                        SharedBitmapManager* bitmap_manager,
+                        gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+                        const RendererSettings& settings,
+                        scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+                        uint32_t compositor_surface_namespace);
   ~OnscreenDisplayClient() override;
 
   bool Initialize();
@@ -46,8 +45,6 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient
   }
 
   // DisplayClient implementation.
-  void CommitVSyncParameters(base::TimeTicks timebase,
-                             base::TimeDelta interval) override;
   void OutputSurfaceLost() override;
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
 
@@ -59,13 +56,9 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient
   // Display depends on DisplayScheduler depends on *BeginFrameSource
   // depends on TaskRunner.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  scoped_ptr<SyntheticBeginFrameSource> synthetic_frame_source_;
-  scoped_ptr<BackToBackBeginFrameSource> unthrottled_frame_source_;
-  scoped_ptr<DisplayScheduler> scheduler_;
   scoped_ptr<Display> display_;
   SurfaceDisplayOutputSurface* surface_display_output_surface_;
   bool output_surface_lost_;
-  bool disable_display_vsync_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient);