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

Unified Diff: services/ui/ws/frame_generator.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 | « services/ui/surfaces/display_compositor_frame_sink.cc ('k') | services/ui/ws/gpu_compositor_frame_sink.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index 0859cff95ebdbb7a5e51ce8246e9052951b3d06a..702818d2ef5e952413533e9b9d320e09d67a3499 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -113,8 +113,9 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
DrawWindowTree(render_pass.get(), root_window_, gfx::Vector2d(), 1.0f);
- cc::CompositorFrame frame;
- frame.render_pass_list.push_back(std::move(render_pass));
+ std::unique_ptr<cc::DelegatedFrameData> frame_data(
+ new cc::DelegatedFrameData);
+ frame_data->render_pass_list.push_back(std::move(render_pass));
if (delegate_->IsInHighContrastMode()) {
std::unique_ptr<cc::RenderPass> invert_pass = cc::RenderPass::Create();
invert_pass->SetNew(cc::RenderPassId(2, 0), output_rect, output_rect,
@@ -132,9 +133,11 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
gfx::Vector2dF() /* filters_scale */,
gfx::PointF() /* filters_origin */,
cc::FilterOperations() /* background_filters */);
- frame.render_pass_list.push_back(std::move(invert_pass));
+ frame_data->render_pass_list.push_back(std::move(invert_pass));
}
+ cc::CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
return frame;
}
« no previous file with comments | « services/ui/surfaces/display_compositor_frame_sink.cc ('k') | services/ui/ws/gpu_compositor_frame_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698