Revert of Added an extra sync token field for extra command buffer identification.

content/common/gpu/gpu_command_buffer_stub.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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash.h"
 #include "base/json/json_writer.h"
 #include "base/memory/shared_memory.h"
@@ skipping 912 matching lines @@
   DCHECK(!sync_points_.empty() && sync_points_.front() == sync_point);
   sync_points_.pop_front();
 
   gpu::gles2::MailboxManager* mailbox_manager =
       context_group_->mailbox_manager();
   if (mailbox_manager->UsesSync() && MakeCurrent()) {
     // Old sync points are global and do not have a command buffer ID,
     // We can simply use the global sync point number as the release count 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.
-    gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 0,
+    gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                               sync_point);
     mailbox_manager->PushTextureUpdates(sync_token);
   }
 
   sync_point_manager_->RetireSyncPoint(sync_point);
 }
 
 bool GpuCommandBufferStub::OnWaitSyncPoint(uint32 sync_point) {
   DCHECK(!waiting_for_sync_point_);
   DCHECK(scheduler_->scheduled());
@@ skipping 35 matching lines @@
   scheduler_->SetScheduled(true);
 }
 
 void GpuCommandBufferStub::PullTextureUpdates(
     gpu::CommandBufferNamespace namespace_id,
     uint64_t command_buffer_id,
     uint32_t release) {
   gpu::gles2::MailboxManager* mailbox_manager =
       context_group_->mailbox_manager();
   if (mailbox_manager->UsesSync() && MakeCurrent()) {
-    gpu::SyncToken sync_token(namespace_id, 0, command_buffer_id, release);
+    gpu::SyncToken sync_token(namespace_id, command_buffer_id, release);
     mailbox_manager->PullTextureUpdates(sync_token);
   }
 }
 
 void GpuCommandBufferStub::OnSignalSyncPoint(uint32 sync_point, uint32 id) {
   sync_point_manager_->AddSyncPointCallback(
       sync_point,
       base::Bind(&GpuCommandBufferStub::OnSignalAck, this->AsWeakPtr(), id));
 }
 
@@ skipping 37 matching lines @@
 
 void GpuCommandBufferStub::OnFenceSyncRelease(uint64_t release) {
   if (sync_point_client_->client_state()->IsFenceSyncReleased(release)) {
     DLOG(ERROR) << "Fence Sync has already been released.";
     return;
   }
 
   gpu::gles2::MailboxManager* mailbox_manager =
       context_group_->mailbox_manager();
   if (mailbox_manager->UsesSync() && MakeCurrent()) {
-    gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
+    gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO,
                               command_buffer_id_, release);
     mailbox_manager->PushTextureUpdates(sync_token);
   }
 
   sync_point_client_->ReleaseFenceSync(release);
 }
 
 bool GpuCommandBufferStub::OnWaitFenceSync(
     gpu::CommandBufferNamespace namespace_id,
     uint64_t command_buffer_id,
@@ skipping 193 matching lines @@
                                                     result));
 }
 
 void GpuCommandBufferStub::SendUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   Send(new GpuCommandBufferMsg_UpdateVSyncParameters(route_id_, timebase,
                                                      interval));
 }
 
 }  // namespace content