Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/surface_factory.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_SURFACE_FACTORY_H_
 #define CC_SURFACES_SURFACE_FACTORY_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 22 matching lines @@
 // A SurfaceFactory is used to create surfaces that may share resources and
 // receive returned resources for frames submitted to those surfaces. Resources
 // submitted to frames created by a particular factory will be returned to that
 // factory's client when they are no longer being used. This is the only class
 // most users of surfaces will need to directly interact with.
 class CC_SURFACES_EXPORT SurfaceFactory
     : public base::SupportsWeakPtr<SurfaceFactory> {
  public:
   using DrawCallback = base::Callback<void()>;
 
-  SurfaceFactory(SurfaceManager* manager, SurfaceFactoryClient* client);
+  SurfaceFactory(const FrameSinkId& frame_sink_id,
+                 SurfaceManager* manager,
+                 SurfaceFactoryClient* client);
   ~SurfaceFactory();
 
+  const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
+
   void Create(const SurfaceId& surface_id);
   void Destroy(const SurfaceId& surface_id);
   void DestroyAll();
 
   // Set that the current frame on new_id is to be treated as the successor to
   // the current frame on old_id for the purposes of calculating damage.
   void SetPreviousFrameSurface(const SurfaceId& new_id,
                                const SurfaceId& old_id);
 
   // A frame can only be submitted to a surface created by this factory,
@@ skipping 20 matching lines @@
   // to have sync points set on them when returned from the Display, for
   // example if the Display shares a context with the creator.
   bool needs_sync_points() const { return needs_sync_points_; }
   void set_needs_sync_points(bool needs) { needs_sync_points_ = needs; }
 
   // SurfaceFactory's owner can call this when it finds out that SurfaceManager
   // is no longer alive during destruction.
   void DidDestroySurfaceManager() { manager_ = nullptr; }
 
  private:
+  FrameSinkId frame_sink_id_;
   SurfaceManager* manager_;
   SurfaceFactoryClient* client_;
   SurfaceResourceHolder holder_;
 
   bool needs_sync_points_;
 
   using OwningSurfaceMap =
       std::unordered_map<SurfaceId, std::unique_ptr<Surface>, SurfaceIdHash>;
   OwningSurfaceMap surface_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_FACTORY_H_