Hook up ui::Compositor to Display's BeginFrameSource

components/mus/surfaces/top_level_display_client.h

Index: components/mus/surfaces/top_level_display_client.h
diff --git a/components/mus/surfaces/top_level_display_client.h b/components/mus/surfaces/top_level_display_client.h
index edc2d45c8bdee2551cfcd3c0dcd48d152ce3c116..b07a25932e35bdc3cbf24f08387c04901a8cdb28 100644
--- a/components/mus/surfaces/top_level_display_client.h
+++ b/components/mus/surfaces/top_level_display_client.h
@@ -15,8 +15,6 @@
 #include "cc/surfaces/surface_factory_client.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
-#include "components/mus/surfaces/surfaces_context_provider.h"
-#include "components/mus/surfaces/surfaces_context_provider_delegate.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "ui/gfx/native_widget_types.h"
@@ -26,7 +24,6 @@ class CopyOutputResult;
 class Display;
 class DisplayScheduler;
 class SurfaceFactory;
-class SyntheticBeginFrameSource;
 }
 
 namespace mus {
@@ -38,8 +35,7 @@ class SurfacesState;
 // provided AcceleratedWidget. Frames are submitted here. New frames are
 // scheduled to be generated here based on VSync.
 class TopLevelDisplayClient : public cc::DisplayClient,
-                              public cc::SurfaceFactoryClient,
-                              public SurfacesContextProviderDelegate {
+                              public cc::SurfaceFactoryClient {
  public:
   TopLevelDisplayClient(gfx::AcceleratedWidget widget,
                         const scoped_refptr<GpuState>& gpu_state,
@@ -54,15 +50,9 @@ class TopLevelDisplayClient : public cc::DisplayClient,
 
  private:
   // DisplayClient implementation.
-  // TODO(rjkroege, fsamuel): This won't work correctly with multiple displays.
-  void CommitVSyncParameters(base::TimeTicks timebase,
-                             base::TimeDelta interval) override;
   void OutputSurfaceLost() override;
   void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
 
-  // SurfacesContextProviderDelegate:
-  void OnVSyncParametersUpdated(int64_t timebase, int64_t interval) override;
-
   // SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
@@ -75,8 +65,6 @@ class TopLevelDisplayClient : public cc::DisplayClient,
   gfx::Size last_submitted_frame_size_;
   scoped_ptr<cc::CompositorFrame> pending_frame_;
 
-  scoped_ptr<cc::SyntheticBeginFrameSource> synthetic_frame_source_;
-  scoped_ptr<cc::DisplayScheduler> scheduler_;
   scoped_ptr<cc::Display> display_;
 
   DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient);