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

content/renderer/pepper/pepper_compositor_host.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/renderer/pepper/pepper_compositor_host.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 172 matching lines @@
 
 void PepperCompositorHost::ViewInitiatedPaint() {
   SendCommitLayersReplyIfNecessary();
 }
 
 void PepperCompositorHost::ImageReleased(
     int32_t id,
     scoped_ptr<base::SharedMemory> shared_memory,
     scoped_ptr<cc::SharedBitmap> bitmap,
     uint32_t sync_point,
+    const gpu::SyncToken& sync_token,
     bool is_lost) {
   bitmap.reset();
   shared_memory.reset();
-  ResourceReleased(id, sync_point, is_lost);
+  ResourceReleased(id, sync_point, sync_token, is_lost);
 }
 
 void PepperCompositorHost::ResourceReleased(int32_t id,
                                             uint32_t sync_point,
+                                            const gpu::SyncToken& sync_token,
                                             bool is_lost) {
-  host()->SendUnsolicitedReply(
-      pp_resource(),
-      PpapiPluginMsg_Compositor_ReleaseResource(id, sync_point, is_lost));
+  host()->SendUnsolicitedReply(pp_resource(),
+                               PpapiPluginMsg_Compositor_ReleaseResource(
+                                   id, sync_point, sync_token, is_lost));
 }
 
 void PepperCompositorHost::SendCommitLayersReplyIfNecessary() {
   if (!commit_layers_reply_context_.is_valid())
     return;
   host()->SendReply(commit_layers_reply_context_,
                     PpapiPluginMsg_Compositor_CommitLayersReply());
   commit_layers_reply_context_ = ppapi::host::ReplyMessageContext();
 }
 
@@ skipping 48 matching lines @@
         new_layer->color->green * 255,
         new_layer->color->blue * 255));
     return;
   }
 
   if (new_layer->texture) {
     scoped_refptr<cc::TextureLayer> texture_layer(
         static_cast<cc::TextureLayer*>(layer.get()));
     if (!old_layer ||
         new_layer->common.resource_id != old_layer->common.resource_id) {
-      cc::TextureMailbox mailbox(new_layer->texture->mailbox,
-                                 new_layer->texture->target,
-                                 new_layer->texture->sync_point);
+      cc::TextureMailbox mailbox(
+          new_layer->texture->mailbox, new_layer->texture->target,
+          new_layer->texture->sync_point, new_layer->texture->sync_token);
       texture_layer->SetTextureMailbox(mailbox,
           cc::SingleReleaseCallback::Create(
               base::Bind(&PepperCompositorHost::ResourceReleased,
                          weak_factory_.GetWeakPtr(),
                          new_layer->common.resource_id)));
       // TODO(penghuang): get a damage region from the application and
       // pass it to SetNeedsDisplayRect().
       texture_layer->SetNeedsDisplay();
     }
     texture_layer->SetPremultipliedAlpha(new_layer->texture->premult_alpha);
@@ skipping 120 matching lines @@
 
   // If the host is not bound to the instance, return PP_OK immediately.
   if (!bound_instance_)
     return PP_OK;
 
   commit_layers_reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content