Revert of Added SyncToken command buffer trait to help with IPC messages.

gpu/command_buffer/client/gles2_implementation.cc

 // 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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 12 matching lines @@
 #include "base/trace_event/process_memory_dump.h"
 #include "gpu/command_buffer/client/buffer_tracker.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/client/query_tracker.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/client/vertex_array_object_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/id_allocator.h"
-#include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/trace_event.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 #if defined(GPU_CLIENT_DEBUG)
 #include "base/command_line.h"
 #include "gpu/command_buffer/client/gpu_switches.h"
 #endif
 
 namespace gpu {
@@ skipping 5338 matching lines @@
     return;
   } else if (!gpu_control_->IsFenceSyncFlushed(fence_sync)) {
     SetGLError(GL_INVALID_OPERATION, "glGenSyncTokenCHROMIUM",
                "fence sync must be flushed before generating sync token");
     return;
   }
 
   SyncToken* sync_token_data = reinterpret_cast<SyncToken*>(sync_token);
   memset(sync_token_data, 0, sizeof(SyncToken));
 
-  sync_token_data->SetData(gpu_control_->GetNamespaceID(),
-                           gpu_control_->GetCommandBufferID(),
-                           fence_sync);
+  sync_token_data->namespace_id = gpu_control_->GetNamespaceID();
+  sync_token_data->command_buffer_id = gpu_control_->GetCommandBufferID();
+  sync_token_data->release_count = fence_sync;
 }
 
 void GLES2Implementation::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) {
   if (!sync_token) {
     SetGLError(GL_INVALID_VALUE, "glWaitSyncTokenCHROMIUM", "empty sync_token");
     return;
   };
 
   const SyncToken* sync_token_data =
       reinterpret_cast<const SyncToken*>(sync_token);
-  helper_->WaitSyncTokenCHROMIUM(sync_token_data->GetNamespaceId(),
-                                 sync_token_data->GetCommandBufferId(),
-                                 sync_token_data->GetReleaseCount());
+  helper_->WaitSyncTokenCHROMIUM(sync_token_data->namespace_id,
+                                 sync_token_data->command_buffer_id,
+                                 sync_token_data->release_count);
 }
 
 namespace {
 
 bool ValidImageFormat(GLenum internalformat,
                       const Capabilities& capabilities) {
   switch (internalformat) {
     case GL_ATC_RGB_AMD:
     case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
       return capabilities.texture_format_atc;
@@ skipping 507 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu