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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.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
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index bdbfbba3b74315e0dcdaaa6ea7e2c7f3d5247c24..4166fb80a767c7134608e94bd68c28b6b86df23c 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -1666,15 +1666,16 @@ cc::CompositorFrame MakeDelegatedFrame(float scale_factor,
gfx::Rect damage) {
cc::CompositorFrame frame;
frame.metadata.device_scale_factor = scale_factor;
+ frame.delegated_frame_data.reset(new cc::DelegatedFrameData);
std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
pass->SetNew(
cc::RenderPassId(1, 1), gfx::Rect(size), damage, gfx::Transform());
- frame.render_pass_list.push_back(std::move(pass));
+ frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
if (!size.IsEmpty()) {
cc::TransferableResource resource;
resource.id = 1;
- frame.resource_list.push_back(std::move(resource));
+ frame.delegated_frame_data->resource_list.push_back(std::move(resource));
}
return frame;
}

Powered by Google App Engine
This is Rietveld 408576698