Added SyncToken command buffer trait to help with IPC messages.

gpu/command_buffer/service/in_process_command_buffer.cc

 // Copyright 2013 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 "gpu/command_buffer/service/in_process_command_buffer.h"
 
 #include <queue>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
-#include "gpu/command_buffer/common/gles2_cmd_format.h"
+#include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gl_context_virtual.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_program_cache.h"
@@ skipping 777 matching lines @@
     bool make_current_success = false;
     {
       base::AutoLock lock(command_buffer_lock_);
       make_current_success = MakeCurrent();
     }
     if (make_current_success) {
       // Old sync points are global and do not have a command buffer ID,
       // We can simply use the GPUIO namespace with 0 for the command buffer ID
       // (under normal circumstances 0 is  invalid so  will not be used) until
       // the old sync points are replaced.
-      gles2::SyncToken sync_token = {gpu::CommandBufferNamespace::GPU_IO, 0,
-                                     sync_point};
+      SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, sync_point);
       mailbox_manager->PushTextureUpdates(sync_token);
     }
   }
   service_->sync_point_manager()->RetireSyncPoint(sync_point);
 }
 
 void InProcessCommandBuffer::SignalSyncPoint(unsigned sync_point,
                                              const base::Closure& callback) {
   CheckSequencedThread();
   QueueTask(base::Bind(&InProcessCommandBuffer::SignalSyncPointOnGpuThread,
                        base::Unretained(this),
                        sync_point,
                        WrapCallback(callback)));
 }
 
 bool InProcessCommandBuffer::WaitSyncPointOnGpuThread(unsigned sync_point) {
   service_->sync_point_manager()->WaitSyncPoint(sync_point);
   gles2::MailboxManager* mailbox_manager =
       decoder_->GetContextGroup()->mailbox_manager();
   // Old sync points are global and do not have a command buffer ID,
   // We can simply use the GPUIO namespace with 0 for the command buffer ID
   // (under normal circumstances 0 is  invalid so  will not be used) until
   // the old sync points are replaced.
-  gles2::SyncToken sync_token = {gpu::CommandBufferNamespace::GPU_IO, 0,
-                                 sync_point};
+  SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, sync_point);
   mailbox_manager->PullTextureUpdates(sync_token);
   return true;
 }
 
 void InProcessCommandBuffer::FenceSyncReleaseOnGpuThread(uint64_t release) {
   DCHECK(!sync_point_client_->client_state()->IsFenceSyncReleased(release));
   gles2::MailboxManager* mailbox_manager =
       decoder_->GetContextGroup()->mailbox_manager();
   if (mailbox_manager->UsesSync()) {
     bool make_current_success = false;
     {
       base::AutoLock lock(command_buffer_lock_);
       make_current_success = MakeCurrent();
     }
     if (make_current_success) {
-      gles2::SyncToken sync_token = {GetNamespaceID(), GetCommandBufferID(),
-                                     release};
+      SyncToken sync_token(GetNamespaceID(), GetCommandBufferID(), release);
       mailbox_manager->PushTextureUpdates(sync_token);
     }
   }
 
   sync_point_client_->ReleaseFenceSync(release);
 }
 
 bool InProcessCommandBuffer::WaitFenceSyncOnGpuThread(
     gpu::CommandBufferNamespace namespace_id,
     uint64_t command_buffer_id,
@@ skipping 12 matching lines @@
     // Use waitable event which is signalled when the release fence is released.
     sync_point_client_->Wait(
         release_state.get(), release,
         base::Bind(&base::WaitableEvent::Signal,
                    base::Unretained(&fence_sync_wait_event_)));
     fence_sync_wait_event_.Wait();
   }
 
   gles2::MailboxManager* mailbox_manager =
       decoder_->GetContextGroup()->mailbox_manager();
-  gles2::SyncToken sync_token = {namespace_id, command_buffer_id, release};
+  SyncToken sync_token(namespace_id, command_buffer_id, release);
   mailbox_manager->PullTextureUpdates(sync_token);
   return true;
 }
 
 void InProcessCommandBuffer::SignalSyncPointOnGpuThread(
     unsigned sync_point,
     const base::Closure& callback) {
   service_->sync_point_manager()->AddSyncPointCallback(sync_point, callback);
 }
 
@@ skipping 170 matching lines @@
     framebuffer_completeness_cache_ =
         new gpu::gles2::FramebufferCompletenessCache;
   return framebuffer_completeness_cache_;
 }
 
 SyncPointManager* GpuInProcessThread::sync_point_manager() {
   return sync_point_manager_;
 }
 
 }  // namespace gpu