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

ppapi/proxy/compositor_resource.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 "ppapi/proxy/compositor_resource.h"
 
 #include "base/logging.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/thunk/enter.h"
 
@@ skipping 18 matching lines @@
   return ++last_resource_id_;
 }
 
 CompositorResource::~CompositorResource() {
   ResetLayersInternal(true);
 
   // Abort all release callbacks.
   for (ReleaseCallbackMap::iterator it = release_callback_map_.begin();
        it != release_callback_map_.end(); ++it) {
     if (!it->second.is_null())
-      it->second.Run(PP_ERROR_ABORTED, 0, false);
+      it->second.Run(PP_ERROR_ABORTED, gpu::SyncToken(), false);
   }
 }
 
 thunk::PPB_Compositor_API* CompositorResource::AsPPB_Compositor_API() {
   return this;
 }
 
 void CompositorResource::OnReplyReceived(
     const ResourceMessageReplyParams& params,
     const IPC::Message& msg) {
@@ skipping 69 matching lines @@
   }
 
   scoped_refptr<TrackedCallback> callback;
   callback.swap(commit_callback_);
   callback->Run(params.result());
 }
 
 void CompositorResource::OnPluginMsgReleaseResource(
     const ResourceMessageReplyParams& params,
     int32_t id,
-    uint32_t sync_point,
+    const gpu::SyncToken& sync_token,
     bool is_lost) {
   ReleaseCallbackMap::iterator it = release_callback_map_.find(id);
   DCHECK(it != release_callback_map_.end()) <<
       "Can not found release_callback_ by id(" << id << ")!";
-  it->second.Run(PP_OK, sync_point, is_lost);
+  it->second.Run(PP_OK, sync_token, is_lost);
   release_callback_map_.erase(it);
 }
 
 void CompositorResource::ResetLayersInternal(bool is_aborted) {
   for (LayerList::iterator it = layers_.begin();
        it != layers_.end(); ++it) {
     ReleaseCallback release_callback = (*it)->release_callback();
     if (!release_callback.is_null()) {
-      release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK, 0, false);
+      release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK,
+                           gpu::SyncToken(), false);
       (*it)->ResetReleaseCallback();
     }
     (*it)->Invalidate();
   }
 
   layers_.clear();
   layer_reset_ = true;
 }
 
 }  // namespace proxy
 }  // namespace ppapi