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

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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.
 
 #include "mojo/gles2/command_buffer_client_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
+#include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
 
 namespace gles2 {
 
 namespace {
 
 bool CreateMapAndDupSharedBuffer(size_t size,
                                  void** memory,
@@ skipping 36 matching lines @@
 void CommandBufferDelegate::ContextLost() {}
 
 CommandBufferClientImpl::CommandBufferClientImpl(
     CommandBufferDelegate* delegate,
     const std::vector<int32_t>& attribs,
     const MojoAsyncWaiter* async_waiter,
     mojo::ScopedMessagePipeHandle command_buffer_handle)
     : delegate_(delegate),
       attribs_(attribs),
       client_binding_(this),
-      command_buffer_id_(0),
+      command_buffer_id_(),
       shared_state_(NULL),
       last_put_offset_(-1),
       next_transfer_buffer_id_(0),
       next_image_id_(0),
       next_fence_sync_release_(1),
       flushed_fence_sync_release_(0),
       async_waiter_(async_waiter) {
   command_buffer_.Bind(mojo::InterfacePtrInfo<mus::mojom::CommandBuffer>(
                            std::move(command_buffer_handle), 0u),
                        async_waiter);
@@ skipping 31 matching lines @@
     return false;
   }
 
   if (!initialize_result) {
     VLOG(1) << "Command buffer cannot be initialized successfully.";
     return false;
   }
 
   DCHECK_EQ(gpu::CommandBufferNamespace::MOJO,
             initialize_result->command_buffer_namespace);
-  command_buffer_id_ = initialize_result->command_buffer_id;
+  command_buffer_id_ = gpu::CommandBufferId::FromUnsafeValue(
+      initialize_result->command_buffer_id);
   capabilities_ = initialize_result->capabilities;
   return true;
 }
 
 gpu::CommandBuffer::State CommandBufferClientImpl::GetLastState() {
   return last_state_;
 }
 
 int32_t CommandBufferClientImpl::GetLastToken() {
   TryUpdateState();
@@ skipping 200 matching lines @@
 }
 
 void CommandBufferClientImpl::EnsureWorkVisible() {
   // This is only relevant for out-of-process command buffers.
 }
 
 gpu::CommandBufferNamespace CommandBufferClientImpl::GetNamespaceID() const {
   return gpu::CommandBufferNamespace::MOJO;
 }
 
-uint64_t CommandBufferClientImpl::GetCommandBufferID() const {
+gpu::CommandBufferId CommandBufferClientImpl::GetCommandBufferID() const {
   return command_buffer_id_;
 }
 
 int32_t CommandBufferClientImpl::GetExtraCommandBufferData() const {
   return 0;
 }
 
 uint64_t CommandBufferClientImpl::GenerateFenceSyncRelease() {
   return next_fence_sync_release_++;
 }
@@ skipping 25 matching lines @@
 
   // It is also safe to wait on the same context.
   if (sync_token->namespace_id() == gpu::CommandBufferNamespace::MOJO &&
       sync_token->command_buffer_id() == GetCommandBufferID())
     return true;
 
   return false;
 }
 
 }  // namespace gles2