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

components/mus/gles2/command_buffer_local.h

 // Copyright 2015 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 COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/mus/gles2/command_buffer_driver.h"
 #include "components/mus/public/interfaces/command_buffer.mojom.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/common/command_buffer.h"
+#include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace {
 class WaitableEvent;
 }
 
 namespace gfx {
@@ skipping 49 matching lines @@
   void DestroyImage(int32_t id) override;
   int32_t CreateGpuMemoryBufferImage(size_t width,
                                      size_t height,
                                      unsigned internal_format,
                                      unsigned usage) override;
   void SignalQuery(uint32_t query_id, const base::Closure& callback) override;
   void SetLock(base::Lock*) override;
   bool IsGpuChannelLost() override;
   void EnsureWorkVisible() override;
   gpu::CommandBufferNamespace GetNamespaceID() const override;
-  uint64_t GetCommandBufferID() const override;
+  gpu::CommandBufferId GetCommandBufferID() const override;
   int32_t GetExtraCommandBufferData() const override;
   uint64_t GenerateFenceSyncRelease() override;
   bool IsFenceSyncRelease(uint64_t release) override;
   bool IsFenceSyncFlushed(uint64_t release) override;
   bool IsFenceSyncFlushReceived(uint64_t release) override;
   void SignalSyncToken(const gpu::SyncToken& sync_token,
                        const base::Closure& callback) override;
   bool CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) override;
 
   // CommandBufferDriver::Client implementation:
@@ skipping 57 matching lines @@
   // This weak factory will be invalidated in the client thread, so all weak
   // pointers have to be dereferenced in the client thread too.
   base::WeakPtrFactory<CommandBufferLocal> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal);
 };
 
 }  //  namespace mus
 
 #endif  // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_