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

ppapi/shared_impl/compositor_layer_data.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_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_
 #define PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_
 
 #include <string.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/common/sync_token.h"
 #include "ppapi/c/ppb_compositor_layer.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
 
 struct PPAPI_SHARED_EXPORT CompositorLayerData {
 
   struct Transform {
     Transform() {
@@ skipping 56 matching lines @@
   struct TextureLayer {
     TextureLayer()
        : target(0),
          sync_point(0),
          source_rect(PP_MakeFloatRectFromXYWH(0.0f, 0.0f, 1.0f, 1.0f)),
          premult_alpha(true) {}
 
     gpu::Mailbox mailbox;
     uint32_t target;
     uint32_t sync_point;
+    gpu::SyncToken sync_token;
     PP_FloatRect source_rect;
     bool premult_alpha;
   };
 
   CompositorLayerData() {}
 
   CompositorLayerData(const CompositorLayerData& other) {
     *this = other;
   }
 
@@ skipping 13 matching lines @@
 
   LayerCommon common;
   scoped_ptr<ColorLayer> color;
   scoped_ptr<TextureLayer> texture;
   scoped_ptr<ImageLayer> image;
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_