Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / surfaces / surface_aggregator.h

diff --git a/src/cc/surfaces/surface_aggregator.h b/src/cc/surfaces/surface_aggregator.h
index 5e91c87..31d35dd 100644 (file)
--- a/src/cc/surfaces/surface_aggregator.h
+++ b/src/cc/surfaces/surface_aggregator.h
@@ -50,8 +50,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
                        const gfx::Transform& content_to_target_transform,
                        RenderPass* dest_pass,
                        SurfaceId surface_id);
-  void CopyPasses(const RenderPassList& source_pass_list,
-                  const Surface* surface);
+  void CopyPasses(const DelegatedFrameData* frame_data, Surface* surface);
 
   bool TakeResources(Surface* surface,
                      const DelegatedFrameData* frame_data,
@@ -67,6 +66,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   typedef base::ScopedPtrHashMap<SurfaceId, RenderPassIdAllocator>
       RenderPassIdAllocatorMap;
   RenderPassIdAllocatorMap render_pass_allocator_map_;
+  int next_render_pass_id_;
 
   typedef base::hash_map<SurfaceId, int> SurfaceToResourceChildIdMap;
   SurfaceToResourceChildIdMap surface_id_to_resource_child_id_;