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

gpu/command_buffer/common/gles2_cmd_format.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.
 
 // This file defines the GLES2 command buffer commands.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
 
 
@@ skipping 185 matching lines @@
   int32_t matrix_stride;
   int32_t is_row_major;
 };
 
 // The format of the bucket filled out by GetUniformsivES3CHROMIUM
 struct UniformsES3Header {
   uint32_t num_uniforms;
   // UniformES3Info uniforms[num_uniforms];
 };
 
+// The format of fence sync tokens.
+struct SyncToken {
+  CommandBufferNamespace namespace_id;
+  uint64_t command_buffer_id;
+  uint64_t release_count;
+
+  bool operator<(const SyncToken& other) const {
+    // TODO(dyen): Once all our compilers support c++11, we can replace this
+    // long list of comparisons with std::tie().
+    return (namespace_id < other.namespace_id) ||
+           ((namespace_id == other.namespace_id) &&
+            ((command_buffer_id < other.command_buffer_id) ||
+             ((command_buffer_id == other.command_buffer_id) &&
+              (release_count < other.release_count))));
+  }
+};
+
 // The format of QuerySync used by EXT_occlusion_query_boolean
 struct QuerySync {
   void Reset() {
     process_count = 0;
     result = 0;
   }
 
   base::subtle::Atomic32 process_count;
   uint64_t result;
 };
@@ skipping 74 matching lines @@
               "should be 24");
 static_assert(offsetof(UniformBlockInfo, referenced_by_fragment_shader) == 28,
               "offset of UniformBlockInfo.referenced_by_fragment_shader "
               "should be 28");
 
 static_assert(sizeof(UniformBlocksHeader) == 4,
               "size of UniformBlocksHeader should be 4");
 static_assert(offsetof(UniformBlocksHeader, num_uniform_blocks) == 0,
               "offset of UniformBlocksHeader.num_uniform_blocks should be 0");
 
+static_assert(sizeof(SyncToken) <= GL_SYNC_TOKEN_SIZE_CHROMIUM,
+              "size of SyncToken must not exceed GL_SYNC_TOKEN_SIZE_CHROMIUM");
+
 namespace cmds {
 
 #include "../common/gles2_cmd_format_autogen.h"
 
 // These are hand written commands.
 // TODO(gman): Attempt to make these auto-generated.
 
 struct GenMailboxCHROMIUM {
   typedef GenMailboxCHROMIUM ValueType;
   static const CommandId kCmdId = kGenMailboxCHROMIUM;
@@ skipping 63 matching lines @@
     "offset of CreateAndConsumeTextureCHROMIUMImmediate.client_id should be 8");
 
 
 #pragma pack(pop)
 
 }  // namespace cmd
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_