Split SurfaceFactoryClient Into Four Interfaces

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 18 matching lines @@
 #include "cc/surfaces/surfaces_export.h"
 
 #if DCHECK_IS_ON()
 #include <iosfwd>
 #include <string>
 #endif
 
 namespace cc {
 class BeginFrameSource;
 class CompositorFrame;
+class FrameSinkManagerClient;
 class Surface;
 class SurfaceFactory;
 class SurfaceFactoryClient;
 
 namespace test {
 class CompositorFrameSinkSupportTest;
 }
 
 class CC_SURFACES_EXPORT SurfaceManager {
  public:
@@ skipping 55 matching lines @@
   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
+  // Associates a FrameSinkManagerClient 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.
+  // FrameSinkManagerClient 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);
+  void RegisterFrameSinkManagerClient(const FrameSinkId& frame_sink_id,
+                                      FrameSinkManagerClient* client);
+  void UnregisterFrameSinkManagerClient(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.
@@ skipping 145 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_