Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

services/ui/ws/server_window_compositor_frame_sink.h

Index: services/ui/ws/server_window_compositor_frame_sink.h
diff --git a/services/ui/ws/server_window_compositor_frame_sink.h b/services/ui/ws/server_window_compositor_frame_sink.h
index 7fb53384e358788f7dca61468ad34fce52cdaa17..aa46906306606b375e54126713b50b1d1742140d 100644
--- a/services/ui/ws/server_window_compositor_frame_sink.h
+++ b/services/ui/ws/server_window_compositor_frame_sink.h
@@ -15,7 +15,6 @@
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "cc/surfaces/surface_sequence_generator.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/ids.h"
@@ -42,38 +41,10 @@ class ServerWindowCompositorFrameSink
 
   ~ServerWindowCompositorFrameSink() override;
 
-  const gfx::Size& last_submitted_frame_size() const {
-    return last_submitted_frame_size_;
-  }
-
-  bool may_contain_video() const { return may_contain_video_; }
-
   // cc::mojom::MojoCompositorFrameSink:
   void SetNeedsBeginFrame(bool needs_begin_frame) override;
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
 
-  // There is a 1-1 correspondence between FrameSinks and frame sources.
-  // The FrameSinkId uniquely identifies the FrameSink, and since there is
-  // one FrameSink per ServerWindowCompositorFrameSink, it allows the window
-  // server to uniquely identify the window, and the thus the client that
-  // generated the frame.
-  const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
-
-  // The LocalFrameId can be thought of as an identifier to a bucket of
-  // sequentially submitted CompositorFrames in the same FrameSink all sharing
-  // the same size and device scale factor.
-  const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
-
-  bool has_frame() const { return !local_frame_id_.is_null(); }
-
-  cc::SurfaceId GetSurfaceId() const;
-
-  // Creates a surface dependency token that expires when this
-  // ServerWindowCompositorFrameSink goes away.
-  cc::SurfaceSequence CreateSurfaceSequence();
-
-  ServerWindow* window();
-
  private:
   void DidReceiveCompositorFrameAck();
 
@@ -82,7 +53,6 @@ class ServerWindowCompositorFrameSink
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   const cc::FrameSinkId frame_sink_id_;
-  cc::SurfaceSequenceGenerator surface_sequence_generator_;
 
   ServerWindowCompositorFrameSinkManager* manager_;  // Owns this.
 
@@ -95,8 +65,6 @@ class ServerWindowCompositorFrameSink
   cc::mojom::MojoCompositorFrameSinkClientPtr client_;
   mojo::Binding<MojoCompositorFrameSink> binding_;
 
-  bool may_contain_video_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(ServerWindowCompositorFrameSink);
 };