SurfaceIds must be reusable as soon as their surfaces are marked destroyed

cc/surfaces/surface_manager.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_MANAGER_H_
 #define CC_SURFACES_SURFACE_MANAGER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 17 matching lines @@
 #include "cc/surfaces/surfaces_export.h"
 
 #if DCHECK_IS_ON()
 #include <iosfwd>
 #include <string>
 #endif
 
 namespace cc {
 class BeginFrameSource;
 class CompositorFrame;
 class Surface;

[jbauman, 2017/03/09 22:21:37]

add "class SurfaceFactory;" here (or add it as an include above if that doesn't
work).

[Saman Sami, 2017/03/09 22:32:04]

Done.

 class SurfaceFactoryClient;
 
 namespace test {
 class CompositorFrameSinkSupportTest;
 }
 
 class CC_SURFACES_EXPORT SurfaceManager {
  public:
   enum class LifetimeType {
     REFERENCES,
     SEQUENCES,
   };
 
   explicit SurfaceManager(LifetimeType lifetime_type = LifetimeType::SEQUENCES);
   ~SurfaceManager();
 
 #if DCHECK_IS_ON()
   // Returns a string representation of all reachable surface references.
   std::string SurfaceReferencesToString();
 #endif
 
   void SetDependencyTracker(
       std::unique_ptr<SurfaceDependencyTracker> dependency_tracker);
   SurfaceDependencyTracker* dependency_tracker() {
     return dependency_tracker_.get();
   }
 
   void RequestSurfaceResolution(Surface* pending_surface);
 
-  void RegisterSurface(Surface* surface);
   void DeregisterSurface(const SurfaceId& surface_id);

[jbauman, 2017/03/09 22:21:37]

Could you make this private while you're changing this around?

[Saman Sami, 2017/03/09 22:32:04]

Done.

 
+  std::unique_ptr<Surface> CreateSurface(
+      base::WeakPtr<SurfaceFactory> surface_factory,
+      const LocalSurfaceId& local_surface_id);
+
   // Destroy the Surface once a set of sequence numbers has been satisfied.
-  void Destroy(std::unique_ptr<Surface> surface);
+  void DestroySurface(std::unique_ptr<Surface> surface);
 
   Surface* GetSurfaceForId(const SurfaceId& surface_id);
 
   void AddObserver(SurfaceObserver* obs) { observer_list_.AddObserver(obs); }
 
   void RemoveObserver(SurfaceObserver* obs) {
     observer_list_.RemoveObserver(obs);
   }
 
   bool SurfaceModified(const SurfaceId& surface_id);
@@ skipping 225 matching lines @@
   std::unique_ptr<SurfaceDependencyTracker> dependency_tracker_;
 
   base::WeakPtrFactory<SurfaceManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_MANAGER_H_