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

content/common/gpu/client/gl_helper.h

 // Copyright (c) 2012 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 CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
 #define CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
 
 #include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 170 matching lines @@
   // scales it to |dst_size|, and writes it into |out|.
   // |src_size| is the size of |src_mailbox|. The result is in |out_color_type|
   // format and is potentially flipped vertically to make it a correct image
   // representation.  |callback| is invoked with the copy result when the copy
   // operation has completed.
   // Note that the texture bound to src_mailbox will have the min/mag filter set
   // to GL_LINEAR and wrap_s/t set to CLAMP_TO_EDGE in this call. src_mailbox is
   // assumed to be GL_TEXTURE_2D.
   void CropScaleReadbackAndCleanMailbox(
       const gpu::Mailbox& src_mailbox,
-      uint32 sync_point,
+      const gpu::SyncToken& sync_token,
       const gfx::Size& src_size,
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       unsigned char* out,
       const SkColorType out_color_type,
       const base::Callback<void(bool)>& callback,
       GLHelper::ScalerQuality quality);
 
   // Copies the texture data out of |texture| into |out|.  |size| is the
   // size of the texture.  No post processing is applied to the pixels.  The
@@ skipping 37 matching lines @@
                            const SkRegion& new_damage,
                            const SkRegion& old_damage);
 
   // Simply creates a texture.
   GLuint CreateTexture();
   // Deletes a texture.
   void DeleteTexture(GLuint texture_id);
 
   // Insert a sync point into the GL command buffer.
   uint32 InsertSyncPoint();
-  // Wait for the sync point before executing further GL commands.
-  void WaitSyncPoint(uint32 sync_point);
+
+  // Wait for the sync token before executing further GL commands.
+  void WaitSyncToken(const gpu::SyncToken& sync_token);
 
   // Creates a mailbox holder that is attached to the given texture id, with a
   // sync point to wait on before using the mailbox. Returns a holder with an
   // empty mailbox on failure.
   // Note the texture is assumed to be GL_TEXTURE_2D.
   gpu::MailboxHolder ProduceMailboxHolderFromTexture(GLuint texture_id);
 
   // Creates a texture and consumes a mailbox into it. Returns 0 on failure.
   // Note the mailbox is assumed to be GL_TEXTURE_2D.
   GLuint ConsumeMailboxToTexture(const gpu::Mailbox& mailbox,
-                                 uint32 sync_point);
+                                 const gpu::SyncToken& sync_token);
 
   // Resizes the texture's size to |size|.
   void ResizeTexture(GLuint texture, const gfx::Size& size);
 
   // Copies the framebuffer data given in |rect| to |texture|.
   void CopyTextureSubImage(GLuint texture, const gfx::Rect& rect);
 
   // Copies the all framebuffer data to |texture|. |size| specifies the
   // size of the framebuffer.
   void CopyTextureFullImage(GLuint texture, const gfx::Size& size);
@@ skipping 90 matching lines @@
  public:
   ReadbackYUVInterface() {}
   virtual ~ReadbackYUVInterface() {}
 
   // Note that |target| must use YV12 format.  |paste_location| specifies where
   // the captured pixels that are read back will be placed in the video frame.
   // The region defined by the |paste_location| and the |dst_size| specified in
   // the call to CreateReadbackPipelineYUV() must be fully contained within
   // |target->visible_rect()|.
   virtual void ReadbackYUV(const gpu::Mailbox& mailbox,
-                           uint32 sync_point,
+                           const gpu::SyncToken& sync_token,
                            const scoped_refptr<media::VideoFrame>& target,
                            const gfx::Point& paste_location,
                            const base::Callback<void(bool)>& callback) = 0;
   virtual GLHelper::ScalerInterface* scaler() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_