Modified old wait sync point functions to also accept new sync tokens.

content/renderer/gpu/mailbox_output_surface.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/renderer/gpu/mailbox_output_surface.h"
 
 #include "base/logging.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/gl_frame_data.h"
@@ skipping 50 matching lines @@
   is_backbuffer_discarded_ = false;
 
   GLES2Interface* gl = context_provider_->ContextGL();
 
   if (!current_backing_.texture_id) {
     // Find a texture of matching size to recycle.
     while (!returned_textures_.empty()) {
       TransferableFrame& texture = returned_textures_.front();
       if (texture.size == surface_size_) {
         current_backing_ = texture;
-        if (current_backing_.sync_point)
-          gl->WaitSyncPointCHROMIUM(current_backing_.sync_point);
+        if (current_backing_.sync_point ||
+            current_backing_.sync_token.HasData()) {
+          gl->WaitSyncPointCHROMIUM(current_backing_.sync_point,
+                                    current_backing_.sync_token.GetConstData());
+        }
         returned_textures_.pop();
         break;
       }
 
       gl->DeleteTextures(1, &texture.texture_id);
       returned_textures_.pop();
     }
 
     if (!current_backing_.texture_id) {
       gl->GenTextures(1, &current_backing_.texture_id);
@@ skipping 84 matching lines @@
       DCHECK(!it->mailbox.IsZero());
       if (!memcmp(it->mailbox.name,
                   ack.gl_frame_data->mailbox.name,
                   sizeof(it->mailbox.name))) {
         DCHECK(it->size == ack.gl_frame_data->size);
         break;
       }
     }
     DCHECK(it != pending_textures_.end());
     it->sync_point = ack.gl_frame_data->sync_point;
+    it->sync_token = ack.gl_frame_data->sync_token;
 
     if (!is_backbuffer_discarded_) {
       returned_textures_.push(*it);
     } else {
       context_provider_->ContextGL()->DeleteTextures(1, &it->texture_id);
     }
 
     pending_textures_.erase(it);
   } else {
     DCHECK(!pending_textures_.empty());
@@ skipping 25 matching lines @@
 
   pending_textures_.push_back(current_backing_);
   current_backing_ = TransferableFrame();
 }
 
 size_t MailboxOutputSurface::GetNumAcksPending() {
   DCHECK(pending_textures_.size());
   return pending_textures_.size() - 1;
 }
 
+MailboxOutputSurface::TransferableFrame::TransferableFrame()
+    : texture_id(0), sync_point(0) {}
+
+MailboxOutputSurface::TransferableFrame::TransferableFrame(
+    uint32 texture_id,
+    const gpu::Mailbox& mailbox,
+    const gfx::Size size)
+    : texture_id(texture_id), mailbox(mailbox), size(size), sync_point(0) {}
+
 }  // namespace content