Index: cc/surfaces/surface_manager.h |
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h |
index f7d68cf425a89590a65b1b16b697319db7729278..507e52b5bd8238f14209eafb33a156873c341e49 100644 |
--- a/cc/surfaces/surface_manager.h |
+++ b/cc/surfaces/surface_manager.h |
@@ -32,10 +32,7 @@ |
#endif |
namespace cc { |
-class BeginFrameSource; |
-class CompositorFrame; |
class Surface; |
-class SurfaceFactoryClient; |
class CC_SURFACES_EXPORT SurfaceManager { |
public: |
@@ -83,44 +80,6 @@ class CC_SURFACES_EXPORT SurfaceManager { |
void RegisterFrameSinkId(const FrameSinkId& frame_sink_id); |
Fady Samuel
2017/02/12 19:04:08
It seems strange to leave this here. What about mo
k.devara
2017/02/13 06:52:00
Yes- sorry I think the dfn still stayed back in su
|
- // 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. |
@@ -152,16 +111,6 @@ class CC_SURFACES_EXPORT SurfaceManager { |
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(); |
@@ -208,28 +157,6 @@ class CC_SURFACES_EXPORT SurfaceManager { |
// 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. |
@@ -240,11 +167,6 @@ class CC_SURFACES_EXPORT SurfaceManager { |
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_; |