mus: Each ServerWindowSurface should have a different client ID

services/ui/ws/server_window_surface_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_
 
 #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 "cc/surfaces/surface_id_allocator.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;
 
@@ skipping 14 matching lines @@
                      mojom::SurfaceClientPtr 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;
 
-  uint32_t client_id() const { return surface_id_allocator_.client_id(); }
   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;
 
-  cc::SurfaceId GenerateId();
-
   ServerWindow* window_;
 
-  cc::SurfaceIdAllocator surface_id_allocator_;
-
   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_