Remove dependency on SurfaceManager in FrameGenerator

services/ui/ws/frame_generator.h

 // Copyright 2016 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_UI_WS_FRAME_GENERATOR_H_
 #define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 33 matching lines @@
 
 class FrameGeneratorDelegate;
 class ServerWindow;
 class ServerWindowCompositorFrameSink;
 
 // Responsible for redrawing the display in response to the redraw requests by
 // submitting CompositorFrames to the owned CompositorFrameSink.
 class FrameGenerator : public ServerWindowTracker,
                        public cc::mojom::MojoCompositorFrameSinkClient {
  public:
-  FrameGenerator(FrameGeneratorDelegate* delegate,
-                 ServerWindow* root_window,
-                 scoped_refptr<DisplayCompositor> display_compositor);
+  FrameGenerator(FrameGeneratorDelegate* delegate, ServerWindow* root_window);
   ~FrameGenerator() override;
 
   void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
 
   // Schedules a redraw for the provided region.
   void RequestRedraw(const gfx::Rect& redraw_region);
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
 
   bool is_frame_pending() { return frame_pending_; }
 
@@ skipping 36 matching lines @@
   // Releases any retained references for the provided FrameSink.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
   void ReleaseFrameSinkReference(const cc::FrameSinkId& frame_sink_id);
 
   // Releases all retained references to surfaces.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
   void ReleaseAllSurfaceReferences();
 
+  ui::DisplayCompositor* GetDisplayCompositor();
+
   // ServerWindowObserver implementation.
   void OnWindowDestroying(ServerWindow* window) override;
 
   FrameGeneratorDelegate* delegate_;
-  scoped_refptr<DisplayCompositor> display_compositor_;
   cc::FrameSinkId frame_sink_id_;
   ServerWindow* const root_window_;
   cc::SurfaceSequenceGenerator surface_sequence_generator_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
   gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   // The region that needs to be redrawn next time the compositor frame is
   // generated.
@@ skipping 12 matching lines @@
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_