| Index: cc/surfaces/surface_id_allocator.h
|
| diff --git a/cc/surfaces/surface_id_allocator.h b/cc/surfaces/surface_id_allocator.h
|
| index 3e1bbc796ee53a38635306868b8b736214125080..5a198e2d9b89a0f21b04144131d6ee8ab65509a5 100644
|
| --- a/cc/surfaces/surface_id_allocator.h
|
| +++ b/cc/surfaces/surface_id_allocator.h
|
| @@ -20,7 +20,7 @@ class SurfaceManager;
|
| // class in a mutex.
|
| class CC_SURFACES_EXPORT SurfaceIdAllocator {
|
| public:
|
| - explicit SurfaceIdAllocator(uint32_t id_namespace);
|
| + SurfaceIdAllocator(uint32_t gpu_id, uint32_t client_id);
|
| ~SurfaceIdAllocator();
|
|
|
| SurfaceId GenerateId();
|
| @@ -31,16 +31,19 @@ class CC_SURFACES_EXPORT SurfaceIdAllocator {
|
| // automatically invalidated and any remaining sequences with that
|
| // namespace will be ignored. This method does not need to be called in
|
| // contexts where there is no SurfaceManager (e.g. a renderer process).
|
| - void RegisterSurfaceIdNamespace(SurfaceManager* manager);
|
| + void RegisterSurfaceClientId(SurfaceManager* manager);
|
|
|
| - uint32_t id_namespace() const { return id_namespace_; }
|
| + uint32_t gpu_id() const { return gpu_id_; }
|
| +
|
| + uint32_t client_id() const { return client_id_; }
|
|
|
| // SurfaceIdAllocator's owner can call this when it find out that
|
| // SurfaceManager is no longer alive during destruction.
|
| void DidDestroySurfaceManager() { manager_ = nullptr; }
|
|
|
| private:
|
| - const uint32_t id_namespace_;
|
| + const uint32_t gpu_id_;
|
| + const uint32_t client_id_;
|
| uint32_t next_id_;
|
| SurfaceManager* manager_;
|
|
|
|
|