| Index: cc/surfaces/surface_manager.h
|
| diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
|
| index 66db9d90ee38df8e10e604dd75463ab3d6644f97..be48245464faa2aa16532dcb6f9f0f17f908cb50 100644
|
| --- a/cc/surfaces/surface_manager.h
|
| +++ b/cc/surfaces/surface_manager.h
|
| @@ -31,8 +31,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
|
| void DeregisterSurface(SurfaceId surface_id);
|
|
|
| // Destroy the Surface once a set of sequence numbers has been satisfied.
|
| - void DestroyOnSequence(scoped_ptr<Surface> surface,
|
| - const std::set<SurfaceSequence>& dependency_set);
|
| + void Destroy(scoped_ptr<Surface> surface);
|
|
|
| Surface* GetSurfaceForId(SurfaceId surface_id);
|
|
|
| @@ -46,8 +45,10 @@ class CC_SURFACES_EXPORT SurfaceManager {
|
|
|
| void SurfaceModified(SurfaceId surface_id);
|
|
|
| - // A frame for a surface satisfies a set of sequence numbers.
|
| - void DidSatisfySequences(SurfaceId id, std::vector<uint32_t>* sequence);
|
| + // A frame for a surface satisfies a set of sequence numbers in a particular
|
| + // id namespace.
|
| + void DidSatisfySequences(uint32_t id_namespace,
|
| + std::vector<uint32_t>* sequence);
|
|
|
| private:
|
| void SearchForSatisfaction();
|
| @@ -59,8 +60,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
|
|
|
| // List of surfaces to be destroyed, along with what sequences they're still
|
| // waiting on.
|
| - typedef std::list<std::pair<Surface*, std::set<SurfaceSequence>>>
|
| - SurfaceDestroyList;
|
| + typedef std::list<Surface*> SurfaceDestroyList;
|
| SurfaceDestroyList surfaces_to_destroy_;
|
|
|
| // Set of SurfaceSequences that have been satisfied by a frame but not yet
|
|
|