Added a way for sync point clients to issue out of order waits.

content/common/gpu/gpu_channel_manager.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/gpu_channel_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
     GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : task_runner_(task_runner),
       io_task_runner_(io_task_runner),
       channel_(channel),
       watchdog_(watchdog),
       shutdown_event_(shutdown_event),
       share_group_(new gfx::GLShareGroup),
       mailbox_manager_(gpu::gles2::MailboxManager::Create()),
       gpu_memory_manager_(this),
       sync_point_manager_(sync_point_manager),
-      sync_point_client_waiter_(new gpu::SyncPointClientWaiter),
+      sync_point_client_waiter_(
+          sync_point_manager->CreateSyncPointClientWaiter()),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
       weak_factory_(this) {
   DCHECK(task_runner);
   DCHECK(io_task_runner);
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
     preemption_flag_ = new gpu::PreemptionFlag;
 }
 
@@ skipping 153 matching lines @@
 
 void GpuChannelManager::OnDestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id,
     const gpu::SyncToken& sync_token) {
   if (sync_token.HasData()) {
     scoped_refptr<gpu::SyncPointClientState> release_state =
         sync_point_manager()->GetSyncPointClientState(
             sync_token.namespace_id(), sync_token.command_buffer_id());
     if (release_state) {
-      sync_point_client_waiter_->Wait(
+      sync_point_client_waiter_->WaitOutOfOrder(
           release_state.get(), sync_token.release_count(),
           base::Bind(&GpuChannelManager::DestroyGpuMemoryBuffer,
                      base::Unretained(this), id, client_id));
       return;
     }
   }
 
   // No sync token or invalid sync token, destroy immediately.
   DestroyGpuMemoryBuffer(id, client_id);
 }
@@ skipping 92 matching lines @@
     }
   }
   if (!stub || !stub->decoder()->MakeCurrent())
     return;
   glFinish();
   DidAccessGpu();
 }
 #endif
 
 }  // namespace content