From 5e50dfa786102701fd831bd155f5dc1ee224458f Mon Sep 17 00:00:00 2001 From: jbauman Date: Wed, 15 Oct 2014 20:21:36 -0700 Subject: Allow CopyOutputRequests on all render passes of a surface The browser compositor in content/ currently expects to be able to do copy output requests of arbitrary layers. The surface aggregator should allow ever render pass to contain copy requests, and move them to the aggregated frame. BUG=397730 Review URL: https://codereview.chromium.org/614073005 Cr-Commit-Position: refs/heads/master@{#299831} --- cc/surfaces/surface_aggregator.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cc/surfaces/surface_aggregator.h') diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h index 5e91c87..64c10e1 100644 --- a/cc/surfaces/surface_aggregator.h +++ b/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, -- cgit v1.1