Move frame_sink_id management to framesink_manager.cc/h from

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 14 matching lines @@
 #include "cc/surfaces/surface_reference_factory.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surfaces_export.h"
 
 #if DCHECK_IS_ON()
 #include <iosfwd>
 #include <string>
 #endif
 
 namespace cc {
-class BeginFrameSource;
-class CompositorFrame;
 class Surface;
-class SurfaceFactoryClient;
 
 class CC_SURFACES_EXPORT SurfaceManager {
  public:
   enum class LifetimeType {
     REFERENCES,
     SEQUENCES,
   };
 
   explicit SurfaceManager(LifetimeType lifetime_type = LifetimeType::SEQUENCES);
   ~SurfaceManager();
@@ skipping 25 matching lines @@
 
   // Require that the given sequence number must be satisfied (using
   // SatisfySequence) before the given surface can be destroyed.
   void RequireSequence(const SurfaceId& surface_id,
                        const SurfaceSequence& sequence);
 
   // Satisfies the given sequence number. Once all sequence numbers that
   // a surface depends on are satisfied, the surface can be destroyed.
   void SatisfySequence(const SurfaceSequence& sequence);
 
   void RegisterFrameSinkId(const FrameSinkId& frame_sink_id);

[Fady Samuel, 2017/02/12 19:04:08]

It seems strange to leave this here. What about moving it to FrameSinkManager?

[k.devara, 2017/02/13 06:52:00]

Yes- sorry I think the dfn still stayed back in surface_manager too - I will
clean it up. 

 
-  // Invalidate a frame_sink_id that might still have associated sequences,
-  // possibly because a renderer process has crashed.
-  void InvalidateFrameSinkId(const FrameSinkId& frame_sink_id);
-
-  // SurfaceFactoryClient, hierarchy, and BeginFrameSource can be registered
-  // and unregistered in any order with respect to each other.
-  //
-  // This happens in practice, e.g. the relationship to between ui::Compositor /
-  // DelegatedFrameHost is known before ui::Compositor has a surface/client).
-  // However, DelegatedFrameHost can register itself as a client before its
-  // relationship with the ui::Compositor is known.
-
-  // Associates a SurfaceFactoryClient with the surface id frame_sink_id it
-  // uses.
-  // SurfaceFactoryClient and surface namespaces/allocators have a 1:1 mapping.
-  // Caller guarantees the client is alive between register/unregister.
-  // Reregistering the same namespace when a previous client is active is not
-  // valid.
-  void RegisterSurfaceFactoryClient(const FrameSinkId& frame_sink_id,
-                                    SurfaceFactoryClient* client);
-  void UnregisterSurfaceFactoryClient(const FrameSinkId& frame_sink_id);
-
-  // Associates a |source| with a particular namespace.  That namespace and
-  // any children of that namespace with valid clients can potentially use
-  // that |source|.
-  void RegisterBeginFrameSource(BeginFrameSource* source,
-                                const FrameSinkId& frame_sink_id);
-  void UnregisterBeginFrameSource(BeginFrameSource* source);
-
-  // Register a relationship between two namespaces.  This relationship means
-  // that surfaces from the child namespace will be displayed in the parent.
-  // Children are allowed to use any begin frame source that their parent can
-  // use.
-  void RegisterFrameSinkHierarchy(const FrameSinkId& parent_frame_sink_id,
-                                  const FrameSinkId& child_frame_sink_id);
-  void UnregisterFrameSinkHierarchy(const FrameSinkId& parent_frame_sink_id,
-                                    const FrameSinkId& child_frame_sink_id);
-
   // Returns the top level root SurfaceId. Surfaces that are not reachable
   // from the top level root may be garbage collected. It will not be a valid
   // SurfaceId and will never correspond to a surface.
   const SurfaceId& GetRootSurfaceId() const;
 
   // Adds a reference from |parent_id| to |child_id|. If there is a temporary
   // references for |child_id| then it will be removed.
   void AddSurfaceReference(const SurfaceId& parent_id,
                            const SurfaceId& child_id);
 
@@ skipping 11 matching lines @@
 
   scoped_refptr<SurfaceReferenceFactory> reference_factory() {
     return reference_factory_;
   }
 
  private:
   friend class SurfaceManagerRefTest;
 
   using SurfaceIdSet = std::unordered_set<SurfaceId, SurfaceIdHash>;
 
-  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 that aren't live.
   void GarbageCollectSurfaces();
 
   // Returns set of live surfaces for |lifetime_manager_| is REFERENCES.
   SurfaceIdSet GetLiveSurfacesForReferences();
 
   // Returns set of live surfaces for |lifetime_manager_| is SEQUENCES.
   SurfaceIdSet GetLiveSurfacesForSequences();
 
   // Adds a reference from |parent_id| to |child_id| without dealing with
@@ skipping 26 matching lines @@
 
   // List of surfaces to be destroyed, along with what sequences they're still
   // waiting on.
   using SurfaceDestroyList = std::list<std::unique_ptr<Surface>>;
   SurfaceDestroyList surfaces_to_destroy_;
 
   // Set of SurfaceSequences that have been satisfied by a frame but not yet
   // waited on.
   std::unordered_set<SurfaceSequence, SurfaceSequenceHash> satisfied_sequences_;
 
-  // Set of valid surface ID namespaces. When a namespace is removed from
-  // this set, any remaining sequences with that namespace are considered
-  // satisfied.
-  std::unordered_set<FrameSinkId, FrameSinkIdHash> valid_frame_sink_ids_;
-
-  // Begin frame source routing. Both BeginFrameSource and SurfaceFactoryClient
-  // pointers guaranteed alive by callers until unregistered.
-  struct FrameSinkSourceMapping {
-    FrameSinkSourceMapping();
-    FrameSinkSourceMapping(const FrameSinkSourceMapping& other);
-    ~FrameSinkSourceMapping();
-    bool is_empty() const { return !client && children.empty(); }
-    // The client that's responsible for creating this namespace.  Never null.
-    SurfaceFactoryClient* client;
-    // The currently assigned begin frame source for this client.
-    BeginFrameSource* source;
-    // This represents a dag of parent -> children mapping.
-    std::vector<FrameSinkId> children;
-  };
-  std::unordered_map<FrameSinkId, FrameSinkSourceMapping, FrameSinkIdHash>
-      frame_sink_source_map_;
-
   // Tracks references from the child surface to parent surface. If there are
   // zero entries in the set for a SurfaceId then nothing is referencing the
   // surface and it can be garbage collected.
   std::unordered_map<SurfaceId, SurfaceIdSet, SurfaceIdHash>
       child_to_parent_refs_;
   // Tracks references from the parent surface to child surface. Is the inverse
   // of |child_to_parent_refs_|.
   std::unordered_map<SurfaceId, SurfaceIdSet, SurfaceIdHash>
       parent_to_child_refs_;
 
-  // Set of which sources are registered to which namespace.  Any child
-  // that is implicitly using this namespace must be reachable by the
-  // parent in the dag.
-  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 LocalSurfaceIds are stored in the order the surfaces are created in.
   std::unordered_map<FrameSinkId, std::vector<LocalSurfaceId>, FrameSinkIdHash>
       temp_references_;
 
   base::WeakPtrFactory<SurfaceManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_MANAGER_H_