Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/direct_compositor_frame_sink.h

 // Copyright 2014 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 CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 #define CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 class Display;
 class SurfaceIdAllocator;
 class SurfaceManager;
 
 // This class submits compositor frames to an in-process Display, with the
 // client's frame being the root surface of the Display.
 class CC_SURFACES_EXPORT DirectCompositorFrameSink
     : public CompositorFrameSink,
       public SurfaceFactoryClient,
       public NON_EXPORTED_BASE(DisplayClient) {
  public:
   // The underlying Display, SurfaceManager, and SurfaceIdAllocator must outlive
   // this class.
   DirectCompositorFrameSink(
+      const FrameSinkId& frame_sink_id,
       SurfaceManager* surface_manager,
-      SurfaceIdAllocator* allocator,
       Display* display,
       scoped_refptr<ContextProvider> context_provider,
       scoped_refptr<ContextProvider> worker_context_provider);
   DirectCompositorFrameSink(
+      const FrameSinkId& frame_sink_id,
       SurfaceManager* surface_manager,
-      SurfaceIdAllocator* allocator,
       Display* display,
       scoped_refptr<VulkanContextProvider> vulkan_context_provider);
   ~DirectCompositorFrameSink() override;
 
   // CompositorFrameSink implementation.
   bool BindToClient(CompositorFrameSinkClient* client) override;
   void DetachFromClient() override;
   void SwapBuffers(CompositorFrame frame) override;
   void ForceReclaimResources() override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
 
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
  private:
   void DidDrawCallback();
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
+  FrameSinkId frame_sink_id_;
   SurfaceManager* surface_manager_;
-  SurfaceIdAllocator* surface_id_allocator_;
+  SurfaceIdAllocator surface_id_allocator_;
   Display* display_;
   SurfaceFactory factory_;
   SurfaceId delegated_surface_id_;
   gfx::Size last_swap_frame_size_;
   bool is_lost_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(DirectCompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_