Remove SurfaceSequence from mus client code.

services/ui/ws/server_window_compositor_frame_sink_manager.h

 // Copyright 2015 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_SERVER_WINDOW_SURFACE_MANAGER_H_
-#define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
+#ifndef SERVICES_UI_WS_SERVER_WINDOW_COMPOSITOR_FRAME_SINK_MANAGER_H_
+#define SERVICES_UI_WS_SERVER_WINDOW_COMPOSITOR_FRAME_SINK_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/output/context_provider.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id.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/surfaces/surfaces_context_provider.h"
 
 namespace gpu {
 class GpuMemoryBufferManager;
 }
 
 namespace ui {
 namespace ws {
 
 class ServerWindow;
 class ServerWindowCompositorFrameSink;
 class ServerWindowCompositorFrameSinkManagerTestApi;
 
 struct CompositorFrameSinkData {
   CompositorFrameSinkData();
   CompositorFrameSinkData(CompositorFrameSinkData&& other);
   ~CompositorFrameSinkData();
 
   CompositorFrameSinkData& operator=(CompositorFrameSinkData&& other);
 
   cc::SurfaceId latest_submitted_surface_id;
   gfx::Size latest_submitted_frame_size;
-  cc::SurfaceSequenceGenerator surface_sequence_generator;
   cc::mojom::MojoCompositorFrameSinkPrivatePtr compositor_frame_sink;
   cc::mojom::MojoCompositorFrameSinkPrivateRequest
       pending_compositor_frame_sink_request;
 };
 
 // ServerWindowCompositorFrameSinkManager tracks the surfaces associated with a
 // ServerWindow.
 // TODO(fsamuel): Delete this once window decorations are managed in the window
 // manager.
 class ServerWindowCompositorFrameSinkManager {
@@ skipping 26 matching lines @@
       const cc::FrameSinkId& frame_sink_id);
   void RemoveChildFrameSinkId(
       mojom::CompositorFrameSinkType compositor_frame_sink_type,
       const cc::FrameSinkId& frame_sink_id);
 
   ServerWindow* window() { return window_; }
 
   bool HasCompositorFrameSinkOfType(mojom::CompositorFrameSinkType type) const;
   bool HasAnyCompositorFrameSink() const;
 
-  // Creates a surface dependency token that expires when the
-  // CompositorFrameSink of type |type| goes away associated with this window.
-  cc::SurfaceSequence CreateSurfaceSequence(
-      mojom::CompositorFrameSinkType type);
   gfx::Size GetLatestFrameSize(mojom::CompositorFrameSinkType type) const;
   cc::SurfaceId GetLatestSurfaceId(mojom::CompositorFrameSinkType type) const;
   void SetLatestSurfaceInfo(mojom::CompositorFrameSinkType type,
                             const cc::SurfaceId& surface_id,
                             const gfx::Size& frame_size);
 
   cc::SurfaceManager* GetCompositorFrameSinkManager();
 
  private:
   friend class ServerWindowCompositorFrameSinkManagerTestApi;
@@ skipping 17 matching lines @@
   // least that of the window. Ideally we would wait for sizes to match, but
   // the underlay is not necessarily as big as the window.
   bool waiting_for_initial_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindowCompositorFrameSinkManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
-#endif  // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
+#endif  // SERVICES_UI_WS_SERVER_WINDOW_COMPOSITOR_FRAME_SINK_MANAGER_H_