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

content/renderer/pepper/pepper_graphics_2d_host.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_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 namespace cc {
 class SharedBitmap;
 class SingleReleaseCallback;
 class TextureMailbox;
 }
 
 namespace gfx {
 class Rect;
 }
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace ppapi {
 struct ViewData;
 }
 
 namespace content {
 
 class PepperPluginInstanceImpl;
 class PPB_ImageData_Impl;
 class RendererPpapiHost;
 
@@ skipping 112 matching lines @@
   // pixels as well for scrolling cases. Returns false for scrolling cases where
   // scaling either |op_rect| or |delta| would require scrolling to fall back to
   // invalidation due to rounding errors, true otherwise.
   static bool ConvertToLogicalPixels(float scale,
                                      gfx::Rect* op_rect,
                                      gfx::Point* delta);
 
   void ReleaseCallback(scoped_ptr<cc::SharedBitmap> bitmap,
                        const gfx::Size& bitmap_size,
                        uint32 sync_point,
+                       const gpu::SyncToken& sync_token,
                        bool lost_resource);
 
   RendererPpapiHost* renderer_ppapi_host_;
 
   scoped_refptr<PPB_ImageData_Impl> image_data_;
 
   // Non-owning pointer to the plugin instance this context is currently bound
   // to, if any. If the context is currently unbound, this will be NULL.
   PepperPluginInstanceImpl* bound_instance_;
 
@@ skipping 30 matching lines @@
   scoped_ptr<cc::SharedBitmap> cached_bitmap_;
   gfx::Size cached_bitmap_size_;
 
   friend class PepperGraphics2DHostTest;
   DISALLOW_COPY_AND_ASSIGN(PepperGraphics2DHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_