Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

services/ui/ws/server_window_surface.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.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.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_manager.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowSurface::ServerWindowSurface(
     ServerWindowSurfaceManager* manager,
     mojo::InterfaceRequest<Surface> request,
     mojom::SurfaceClientPtr client)
-    : manager_(manager),
-      surface_id_allocator_(cc::FrameSinkId(
+    : frame_sink_id_(
           manager->window()->delegate()->GetSurfacesState()->next_client_id(),
-          0)),
-      surface_factory_(manager_->GetSurfaceManager(), this),
+          0),
+      manager_(manager),
+      surface_id_allocator_(frame_sink_id_),
+      surface_factory_(frame_sink_id_, manager_->GetSurfaceManager(), this),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
-  surface_manager->RegisterFrameSinkId(surface_id_allocator_.frame_sink_id());
-  surface_manager->RegisterSurfaceFactoryClient(
-      surface_id_allocator_.frame_sink_id(), this);
+  surface_manager->RegisterFrameSinkId(frame_sink_id_);
+  surface_manager->RegisterSurfaceFactoryClient(frame_sink_id_, this);
 }
 
 ServerWindowSurface::~ServerWindowSurface() {
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_.DestroyAll();
   cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
-  surface_manager->UnregisterSurfaceFactoryClient(
-      surface_id_allocator_.frame_sink_id());
-  surface_manager->InvalidateFrameSinkId(surface_id_allocator_.frame_sink_id());
+  surface_manager->UnregisterSurfaceFactoryClient(frame_sink_id_);
+  surface_manager->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void ServerWindowSurface::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const SubmitCompositorFrameCallback& callback) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list[0]->output_rect.size();
   // If the size of the CompostiorFrame has changed then destroy the existing
   // Surface and create a new one of the appropriate size.
   if (surface_id_.is_null() || frame_size != last_submitted_frame_size_) {
@@ skipping 36 matching lines @@
   client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources));
 }
 
 void ServerWindowSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace ui