Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

services/ui/ws/server_window_surface_manager.h

Index: services/ui/ws/server_window_surface_manager.h
diff --git a/services/ui/ws/server_window_surface_manager.h b/services/ui/ws/server_window_surface_manager.h
deleted file mode 100644
index d7d62ef532c8d632591668451eeafc5df0223b76..0000000000000000000000000000000000000000
--- a/services/ui/ws/server_window_surface_manager.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// 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_
-
-#include <map>
-
-#include "base/macros.h"
-#include "cc/ipc/compositor_frame.mojom.h"
-#include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_id.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "services/ui/public/interfaces/window_tree.mojom.h"
-
-namespace ui {
-namespace ws {
-
-class ServerWindow;
-class ServerWindowSurface;
-class ServerWindowSurfaceManagerTestApi;
-
-// ServerWindowSurfaceManager tracks the surfaces associated with a
-// ServerWindow.
-class ServerWindowSurfaceManager {
- public:
-  explicit ServerWindowSurfaceManager(ServerWindow* window);
-  ~ServerWindowSurfaceManager();
-
-  // Returns true if the surfaces from this manager should be drawn.
-  bool ShouldDraw();
-
-  // Creates a new surface of the specified type, replacing the existing one of
-  // the specified type.
-  void CreateSurface(
-      mojom::SurfaceType surface_type,
-      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
-      cc::mojom::MojoCompositorFrameSinkClientPtr client);
-
-  ServerWindow* window() { return window_; }
-
-  ServerWindowSurface* GetDefaultSurface() const;
-  ServerWindowSurface* GetUnderlaySurface() const;
-  ServerWindowSurface* GetSurfaceByType(mojom::SurfaceType type) const;
-  bool HasSurfaceOfType(mojom::SurfaceType type) const;
-  bool HasAnySurface() const;
-
-  cc::SurfaceManager* GetSurfaceManager();
-
- private:
-  friend class ServerWindowSurfaceManagerTestApi;
-  friend class ServerWindowSurface;
-
-  // Returns true if a surface of |type| has been set and its size is greater
-  // than the size of the window.
-  bool IsSurfaceReadyAndNonEmpty(mojom::SurfaceType type) const;
-
-  ServerWindow* window_;
-
-  using TypeToSurfaceMap =
-      std::map<mojom::SurfaceType, std::unique_ptr<ServerWindowSurface>>;
-
-  TypeToSurfaceMap type_to_surface_map_;
-
-  // While true the window is not drawn. This is initially true if the window
-  // has the property |kWaitForUnderlay_Property|. This is set to false once
-  // the underlay and default surface have been set *and* their size is at
-  // 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(ServerWindowSurfaceManager);
-};
-
-}  // namespace ws
-}  // namespace ui
-
-#endif  // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_