gpu: Fix a bug in the generation of the destruction sync token for GMBs.

content/common/gpu/client/command_buffer_proxy_impl.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 "content/common/gpu/client/command_buffer_proxy_impl.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 431 matching lines @@
   params.gpu_memory_buffer = handle;
   params.size = gfx::Size(width, height);
   params.format = gpu_memory_buffer->GetFormat();
   params.internal_format = internal_format;
   params.image_release_count = image_fence_sync;
 
   if (!Send(new GpuCommandBufferMsg_CreateImage(route_id_, params)))
     return -1;
 
   if (image_fence_sync) {
-    gpu::SyncToken sync_token(GetNamespaceID(), GetCommandBufferID(),
-                              GetExtraCommandBufferData(), image_fence_sync);
+    gpu::SyncToken sync_token(GetNamespaceID(), GetExtraCommandBufferData(),
+                              GetCommandBufferID(), image_fence_sync);
 
     // Force a synchronous IPC to validate sync token.
     channel_->ValidateFlushIDReachedServer(stream_id_, true);
     sync_token.SetVerifyFlush();
 
     gpu_memory_buffer_manager->SetDestructionSyncToken(gpu_memory_buffer,
                                                        sync_token);
   }
 
   return new_id;
@@ skipping 302 matching lines @@
   }
 }
 
 void CommandBufferProxyImpl::OnUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   if (!update_vsync_parameters_completion_callback_.is_null())
     update_vsync_parameters_completion_callback_.Run(timebase, interval);
 }
 
 }  // namespace content