Added more strict checks for fence sync counters.

gpu/ipc/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 "gpu/ipc/client/command_buffer_proxy_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 409 matching lines @@
   bool requires_sync_token = false;
   gfx::GpuMemoryBufferHandle handle =
       channel_->ShareGpuMemoryBufferToGpuProcess(gpu_memory_buffer->GetHandle(),
                                                  &requires_sync_token);
 
   uint64_t image_fence_sync = 0;
   if (requires_sync_token) {
     image_fence_sync = GenerateFenceSyncRelease();
 
     // Make sure fence syncs were flushed before CreateImage() was called.
-    DCHECK_LE(image_fence_sync - 1, flushed_fence_sync_release_);
+    DCHECK_EQ(image_fence_sync, flushed_fence_sync_release_ + 1);
   }
 
   DCHECK(gpu::IsGpuMemoryBufferFormatSupported(gpu_memory_buffer->GetFormat(),
                                                capabilities_));
   DCHECK(gpu::IsImageSizeValidForGpuMemoryBufferFormat(
       gfx::Size(width, height), gpu_memory_buffer->GetFormat()));
   DCHECK(gpu::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
       internal_format, gpu_memory_buffer->GetFormat()));
 
   GpuCommandBufferMsg_CreateImage_Params params;
@@ skipping 81 matching lines @@
 
 gpu::CommandBufferId CommandBufferProxyImpl::GetCommandBufferID() const {
   return command_buffer_id_;
 }
 
 int32_t CommandBufferProxyImpl::GetExtraCommandBufferData() const {
   return stream_id_;
 }
 
 uint64_t CommandBufferProxyImpl::GenerateFenceSyncRelease() {
+  CheckLock();
   return next_fence_sync_release_++;
 }
 
 bool CommandBufferProxyImpl::IsFenceSyncRelease(uint64_t release) {
+  CheckLock();
   return release != 0 && release < next_fence_sync_release_;
 }
 
 bool CommandBufferProxyImpl::IsFenceSyncFlushed(uint64_t release) {
+  CheckLock();
   return release != 0 && release <= flushed_fence_sync_release_;
 }
 
 bool CommandBufferProxyImpl::IsFenceSyncFlushReceived(uint64_t release) {
   CheckLock();
   if (last_state_.error != gpu::error::kNoError)
     return false;
 
   if (release <= verified_fence_sync_release_)
     return true;
@@ skipping 170 matching lines @@
 }
 
 void CommandBufferProxyImpl::InvalidGpuReplyOnClientThread() {
   std::unique_ptr<base::AutoLock> lock;
   if (lock_)
     lock.reset(new base::AutoLock(*lock_));
   OnDestroyed(gpu::error::kInvalidGpuMessage, gpu::error::kLostContext);
 }
 
 }  // namespace gpu