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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2503203002: Revert "Getting rid of DelegatedFrameData" (Closed)
Patch Set: Created 4 years, 1 month 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 | « content/browser/renderer_host/delegated_frame_host.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 7887b5d71d80ac4d0c7ac9940e1dfdbf148c974b..9a76bae9c87376deaff6fca06f7b11c82ba19ecf 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1824,7 +1824,10 @@ bool RenderWidgetHostImpl::OnSwapCompositorFrame(
view_->DidReceiveRendererFrame();
} else {
cc::ReturnedResourceArray resources;
- cc::TransferableResource::ReturnResources(frame.resource_list, &resources);
+ if (frame.delegated_frame_data) {
+ cc::TransferableResource::ReturnResources(
+ frame.delegated_frame_data->resource_list, &resources);
+ }
SendReclaimCompositorResources(routing_id_, compositor_frame_sink_id,
process_->GetID(), true /* is_swap_ack */,
resources);
« no previous file with comments | « content/browser/renderer_host/delegated_frame_host.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698