cc/surfaces/surface_aggregator.h - Issue 2098953003: Make cc::CompositorFrames movable [Part 2 of 2]

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/surfaces/surface_aggregator.h

Issue 2098953003: Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Android compiles locally Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/surfaces/surface_aggregator.h

diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h

index e94261ecca11c74300fce5d1f08a9d0f4a1001c8..99e93308f42622403f9e1da590829129fbc46472 100644

--- a/cc/surfaces/surface_aggregator.h

+++ b/cc/surfaces/surface_aggregator.h

@@ -36,7 +36,7 @@ class CC_SURFACES_EXPORT SurfaceAggregator {

bool aggregate_only_damaged);

~SurfaceAggregator();

- std::unique_ptr<CompositorFrame> Aggregate(SurfaceId surface_id);

+ CompositorFrame Aggregate(SurfaceId surface_id);

void ReleaseResources(SurfaceId surface_id);

SurfaceIndexMap& previous_contained_surfaces() {

return previous_contained_surfaces_;