diff options
author | jbauman <jbauman@chromium.org> | 2014-10-15 20:21:36 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 03:21:50 +0000 |
commit | 5e50dfa786102701fd831bd155f5dc1ee224458f (patch) | |
tree | 6c828567f5d0603bf6fd194e1c1535b9f9802951 /cc/surfaces/surface_aggregator.h | |
parent | 9cbbf89c8c26d26332ca4bb8ac9a503771ad0c04 (diff) | |
download | chromium_src-5e50dfa786102701fd831bd155f5dc1ee224458f.zip chromium_src-5e50dfa786102701fd831bd155f5dc1ee224458f.tar.gz chromium_src-5e50dfa786102701fd831bd155f5dc1ee224458f.tar.bz2 |
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}
Diffstat (limited to 'cc/surfaces/surface_aggregator.h')
-rw-r--r-- | cc/surfaces/surface_aggregator.h | 3 |
1 files changed, 1 insertions, 2 deletions
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, |