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

ppapi/proxy/compositor_layer_resource.h

 // 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.
 
 #ifndef PPAPI_PROXY_COMPOSITOR_LAYER_RESOURCE_H_
 #define PPAPI_PROXY_COMPOSITOR_LAYER_RESOURCE_H_
 
 #include "ppapi/c/ppb_compositor_layer.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/compositor_layer_data.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/thunk/ppb_compositor_layer_api.h"
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace ppapi {
 namespace proxy {
 
 class CompositorResource;
 
 class PPAPI_PROXY_EXPORT CompositorLayerResource
     : public PluginResource,
       public thunk::PPB_CompositorLayer_API {
  public:
   // Release callback for texture or image layer.
-  typedef base::Callback<void(int32_t, uint32_t, bool)> ReleaseCallback;
+  typedef base::Callback<void(int32_t, const gpu::SyncToken&, bool)>
+      ReleaseCallback;
 
   CompositorLayerResource(Connection connection,
                           PP_Instance instance,
                           const CompositorResource* compositor);
 
   const CompositorLayerData& data() const { return data_; }
   const ReleaseCallback& release_callback() const {
     return release_callback_;
   }
   void ResetReleaseCallback() { release_callback_.Reset(); }
@@ skipping 60 matching lines @@
   // Layer data.
   CompositorLayerData data_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorLayerResource);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_COMPOSITOR_LAYER_RESOURCE_H_