Pull parts of TopLevelDisplayClient into DisplayCompositor

components/mus/ws/server_window_surface_manager.cc

 // 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.
 
 #include "components/mus/ws/server_window_surface_manager.h"
 
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_surface.h"
 
 namespace mus {
 namespace ws {
 
 ServerWindowSurfaceManager::ServerWindowSurfaceManager(ServerWindow* window)
     : window_(window),
-      surface_id_allocator_(WindowIdToTransportId(window->id())),
+      surface_id_allocator_(
+          window->delegate()->GetSurfacesState()->next_id_namespace()),
       waiting_for_initial_frames_(
           window_->properties().count(mus::mojom::kWaitForUnderlay_Property) >
           0) {
   surface_id_allocator_.RegisterSurfaceIdNamespace(GetSurfaceManager());
 }
 
 ServerWindowSurfaceManager::~ServerWindowSurfaceManager() {
   // Explicitly clear the type to surface manager so that this manager
   // is still valid prior during ~ServerWindowSurface.
   type_to_surface_map_.clear();
@@ skipping 64 matching lines @@
   return last_submitted_frame_size.width() >= window_->bounds().width() &&
          last_submitted_frame_size.height() >= window_->bounds().height();
 }
 
 cc::SurfaceId ServerWindowSurfaceManager::GenerateId() {
   return surface_id_allocator_.GenerateId();
 }
 
 }  // namespace ws
 }  // namespace mus