Introducing gpu::CommandBufferId as a distinct, IdType<...>-based type.

gpu/command_buffer/service/sync_point_manager.h

 // Copyright (c) 2012 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 GPU_COMMAND_BUFFER_SERVICE_SYNC_POINT_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SYNC_POINT_MANAGER_H_
 
 #include <stdint.h>
 
 #include <functional>
 #include <queue>
+#include <unordered_map>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/callback.h"
-#include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
+#include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/gpu_export.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace gpu {
 
 class SyncPointClient;
@@ skipping 207 matching lines @@
 
   void ReleaseFenceSync(uint64_t release);
 
  private:
   friend class SyncPointManager;
 
   SyncPointClient();
   SyncPointClient(SyncPointManager* sync_point_manager,
                   scoped_refptr<SyncPointOrderData> order_data,
                   CommandBufferNamespace namespace_id,
-                  uint64_t client_id);
+                  CommandBufferId client_id);
 
   // Sync point manager is guaranteed to exist in the lifetime of the client.
   SyncPointManager* sync_point_manager_;
 
   // Keep the state that is sharable across multiple threads.
   scoped_refptr<SyncPointClientState> client_state_;
 
   // Unique namespace/client id pair for this sync point client.
   const CommandBufferNamespace namespace_id_;
-  const uint64_t client_id_;
+  const CommandBufferId client_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncPointClient);
 };
 
 // This class manages the sync points, which allow cross-channel
 // synchronization.
 class GPU_EXPORT SyncPointManager {
  public:
   explicit SyncPointManager(bool allow_threaded_wait);
   ~SyncPointManager();
 
   // Creates/Destroy a sync point client which message processors should hold.
   scoped_ptr<SyncPointClient> CreateSyncPointClient(
       scoped_refptr<SyncPointOrderData> order_data,
       CommandBufferNamespace namespace_id,
-      uint64_t client_id);
+      CommandBufferId client_id);
 
   // Creates a sync point client which cannot process order numbers but can only
   // Wait out of order.
   scoped_ptr<SyncPointClient> CreateSyncPointClientWaiter();
 
   // Finds the state of an already created sync point client.
   scoped_refptr<SyncPointClientState> GetSyncPointClientState(
-    CommandBufferNamespace namespace_id, uint64_t client_id);
+      CommandBufferNamespace namespace_id,
+      CommandBufferId client_id);
 
  private:
   friend class SyncPointClient;
   friend class SyncPointOrderData;
 
-  typedef base::hash_map<uint64_t, SyncPointClient*> ClientMap;
+  using ClientMap = std::unordered_map<CommandBufferId,
+                                       SyncPointClient*,
+                                       CommandBufferId::Hasher>;
 
   uint32_t GenerateOrderNumber();
   void DestroySyncPointClient(CommandBufferNamespace namespace_id,
-                              uint64_t client_id);
+                              CommandBufferId client_id);
 
   // Order number is global for all clients.
   base::AtomicSequenceNumber global_order_num_;
 
   // Client map holds a map of clients id to client for each namespace.
   base::Lock client_maps_lock_;
   ClientMap client_maps_[NUM_COMMAND_BUFFER_NAMESPACES];
 
   DISALLOW_COPY_AND_ASSIGN(SyncPointManager);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SYNC_POINT_MANAGER_H_