Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

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: post-rebase fixes 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
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..b7c8190d927be61fe73dfc3ae425b4592a2675ec 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1482,7 +1482,8 @@ 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::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;
}

Powered by Google App Engine
This is Rietveld 408576698