content/browser/renderer_host/render_widget_host_impl.cc - Issue 23097005: cc: return resources via a ReturnedResource struct rather than TransferableResource

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: content/browser/renderer_host/render_widget_host_impl.cc

Issue 23097005: cc: return resources via a ReturnedResource struct rather than TransferableResource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review nits Created 7 years, 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « cc/trees/layer_tree_host_unittest_delegated.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_impl.cc

diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc

index edd21fe5987575faff070ae5dc9e50fd355d00f0..289879da2c4954ff3fc79fc845006e70883dd146 100644

--- a/content/browser/renderer_host/render_widget_host_impl.cc

+++ b/content/browser/renderer_host/render_widget_host_impl.cc

@@ -1482,7 +1482,9 @@ bool RenderWidgetHostImpl::OnSwapCompositorFrame(

ack.gl_frame_data = frame->gl_frame_data.Pass();

ack.gl_frame_data->sync_point = 0;

} else if (frame->delegated_frame_data) {

- ack.resources.swap(frame->delegated_frame_data->resource_list);

+ cc::TransferableResource::ReturnResources(

+ frame->delegated_frame_data->resource_list,

+ &ack.resources);

} else if (frame->software_frame_data) {

ack.last_software_frame_id = frame->software_frame_data->id;

}

« no previous file with comments | « cc/trees/layer_tree_host_unittest_delegated.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »