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 b70176956cddffc05f5b421d38a1d96858c4636f..9dfeb0a0f32d3cffe7d741e9fa1100d6db4ca411 100644
--- a/components/mus/surfaces/top_level_display_client.h
+++ b/components/mus/surfaces/top_level_display_client.h
@@ -16,8 +16,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"
@@ -27,7 +25,6 @@ class CopyOutputResult;
 class Display;
 class DisplayScheduler;
 class SurfaceFactory;
-class SyntheticBeginFrameSource;
 }
 
 namespace mus {
@@ -39,8 +36,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,
@@ -56,15 +52,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;
@@ -77,8 +67,6 @@ class TopLevelDisplayClient : public cc::DisplayClient,
   gfx::Size last_submitted_frame_size_;
   std::unique_ptr<cc::CompositorFrame> pending_frame_;
 
-  std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_frame_source_;
-  std::unique_ptr<cc::DisplayScheduler> scheduler_;
   std::unique_ptr<cc::Display> display_;
 
   DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient);