mus: Each ServerWindowSurface should have a different client ID

services/ui/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 "services/ui/ws/server_window_surface_manager.h"
 
 #include "services/ui/surfaces/surfaces_state.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_surface.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowSurfaceManager::ServerWindowSurfaceManager(ServerWindow* window)
     : window_(window),
-      surface_id_allocator_(
-          window->delegate()->GetSurfacesState()->next_client_id()),
       waiting_for_initial_frames_(
           window_->properties().count(ui::mojom::kWaitForUnderlay_Property) >
           0) {
-  surface_id_allocator_.RegisterSurfaceClientId(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();
 }
 
 bool ServerWindowSurfaceManager::ShouldDraw() {
   if (!waiting_for_initial_frames_)
     return true;
 
   waiting_for_initial_frames_ =
       !IsSurfaceReadyAndNonEmpty(mojom::SurfaceType::DEFAULT) ||
       !IsSurfaceReadyAndNonEmpty(mojom::SurfaceType::UNDERLAY);
   return !waiting_for_initial_frames_;
 }
 
 void ServerWindowSurfaceManager::CreateSurface(
     mojom::SurfaceType surface_type,
     mojo::InterfaceRequest<mojom::Surface> request,
     mojom::SurfaceClientPtr client) {
   std::unique_ptr<ServerWindowSurface> surface(
       new ServerWindowSurface(this, std::move(request), std::move(client)));
-  if (!HasAnySurface()) {
-    // Only one SurfaceFactoryClient can be registered per surface id namespace,
-    // so register the first one.  Since all surfaces created by this manager
-    // represent the same window, the begin frame source can be shared by
-    // all surfaces created here.
-    surface->RegisterForBeginFrames();
-  }
   type_to_surface_map_[surface_type] = std::move(surface);
 }
 
 ServerWindowSurface* ServerWindowSurfaceManager::GetDefaultSurface() const {
   return GetSurfaceByType(mojom::SurfaceType::DEFAULT);
 }
 
 ServerWindowSurface* ServerWindowSurfaceManager::GetUnderlaySurface() const {
   return GetSurfaceByType(mojom::SurfaceType::UNDERLAY);
 }
@@ skipping 23 matching lines @@
   if (iter == type_to_surface_map_.end())
     return false;
   if (iter->second->last_submitted_frame_size().IsEmpty())
     return false;
   const gfx::Size& last_submitted_frame_size =
       iter->second->last_submitted_frame_size();
   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 ui