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

content/browser/compositor/owned_mailbox.cc

 // Copyright 2014 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/browser/compositor/owned_mailbox.h"
 
 #include "base/logging.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/common/gpu/client/gl_helper.h"
 
 namespace content {
 
 OwnedMailbox::OwnedMailbox(GLHelper* gl_helper)
     : texture_id_(0), gl_helper_(gl_helper) {
   texture_id_ = gl_helper_->CreateTexture();
   mailbox_holder_ = gl_helper_->ProduceMailboxHolderFromTexture(texture_id_);
   ImageTransportFactory::GetInstance()->AddObserver(this);
 }
 
 OwnedMailbox::~OwnedMailbox() {
   if (gl_helper_)
     Destroy();
 }
 
-void OwnedMailbox::UpdateSyncPoint(uint32 sync_point) {
-  if (sync_point)
+void OwnedMailbox::UpdateSyncPoint(uint32 sync_point,
+                                   const gpu::SyncToken& sync_token) {
+  if (sync_point || sync_token.HasData()) {
     mailbox_holder_.sync_point = sync_point;
+    mailbox_holder_.sync_token = sync_token;
+  }
 }
 
 void OwnedMailbox::Destroy() {
   ImageTransportFactory::GetInstance()->RemoveObserver(this);
-  gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point);
+  gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point,
+                            mailbox_holder_.sync_token);
   gl_helper_->DeleteTexture(texture_id_);
   texture_id_ = 0;
   mailbox_holder_ = gpu::MailboxHolder();
   gl_helper_ = NULL;
 }
 
 void OwnedMailbox::OnLostResources() {
   if (gl_helper_)
     Destroy();
 }
 
 }  // namespace content