Moving temporary reference logic to SurfaceManager

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 108 matching lines @@
   void RemoveSurfaceReference(const SurfaceId& parent_id,
                               const SurfaceId& child_id) override;
   size_t GetSurfaceReferenceCount(const SurfaceId& surface_id) const override;
   size_t GetReferencedSurfaceCount(const SurfaceId& surface_id) const override;
 
   scoped_refptr<SurfaceReferenceFactory> reference_factory() {
     return reference_factory_;
   }
 
  private:
+  friend class SurfaceManagerRefTest;
+
   void RecursivelyAttachBeginFrameSource(const FrameSinkId& frame_sink_id,
                                          BeginFrameSource* source);
   void RecursivelyDetachBeginFrameSource(const FrameSinkId& frame_sink_id,
                                          BeginFrameSource* source);
   // Returns true if |child namespace| is or has |search_frame_sink_id| as a
   // child.
   bool ChildContains(const FrameSinkId& child_frame_sink_id,
                      const FrameSinkId& search_frame_sink_id) const;
 
   // Garbage collects all destroyed surfaces not reachable from the root. Used
   // when |use_references_| is true.
   void GarbageCollectSurfacesFromRoot();
   void GarbageCollectSurfaces();
 
   // Removes reference from a parent surface to a child surface. Used to remove
   // references without triggered GC.
   void RemoveSurfaceReferenceImpl(const SurfaceId& parent_id,
                                   const SurfaceId& child_id);
 
+  // Adds a reference from parent id to child id without dealing with temporary
+  // references.
+  void AddSurfaceReferenceImpl(const SurfaceId& parent_id,
+                               const SurfaceId& child_id);
+
   // Use reference or sequence based lifetime management.
   LifetimeType lifetime_type_;
 
   using SurfaceMap = std::unordered_map<SurfaceId, Surface*, SurfaceIdHash>;
   SurfaceMap surface_map_;
   base::ObserverList<SurfaceObserver> observer_list_;
   base::ThreadChecker thread_checker_;
 
   // List of surfaces to be destroyed, along with what sequences they're still
   // waiting on.
@@ skipping 43 matching lines @@
   std::unordered_map<BeginFrameSource*, FrameSinkId> registered_sources_;
 
   // Root SurfaceId that references display root surfaces. There is no Surface
   // with this id, it's for bookkeeping purposes only.
   const SurfaceId root_surface_id_;
 
   // The DirectSurfaceReferenceFactory that uses this manager to create surface
   // references.
   scoped_refptr<SurfaceReferenceFactory> reference_factory_;
 
+  // SurfaceIds that have temporary references from top level root so they
+  // aren't GC'd before a real reference is added. This is basically a
+  // collection of surface ids, for example:
+  //   SurfaceId surface_id(key, value[index]);
+  // The LocalFrameIds are stored in the order the surfaces are created in.
+  std::unordered_map<FrameSinkId, std::vector<LocalFrameId>, FrameSinkIdHash>
+      temp_references_;
+
   base::WeakPtrFactory<SurfaceManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_MANAGER_H_