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

Unified Diff: content/browser/compositor/mus_browser_compositor_output_surface.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: IsEmpty + rebase Created 4 years, 2 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/compositor/mus_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.cc b/content/browser/compositor/mus_browser_compositor_output_surface.cc
index 8f2ee8b241c4432c1416f088ffc7f0f87e5c9ecd..bebf0330233ed2b170d62409e7c47bc23ea84278 100644
--- a/content/browser/compositor/mus_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/mus_browser_compositor_output_surface.cc
@@ -45,7 +45,6 @@ void MusBrowserCompositorOutputSurface::SwapBuffers(
ui_frame.metadata.latency_info = std::move(frame.latency_info);
// Reset latency_info to known empty state after moving contents.
frame.latency_info.clear();
- ui_frame.delegated_frame_data = base::MakeUnique<cc::DelegatedFrameData>();
const cc::RenderPassId render_pass_id(1, 1);
std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
const bool has_transparent_background = true;
@@ -86,7 +85,7 @@ void MusBrowserCompositorOutputSurface::SwapBuffers(
resource.read_lock_fences_enabled = false;
resource.is_software = false;
resource.is_overlay_candidate = false;
- ui_frame.delegated_frame_data->resource_list.push_back(std::move(resource));
+ ui_frame.resource_list.push_back(std::move(resource));
const bool needs_blending = true;
const bool premultiplied_alpha = true;
@@ -105,7 +104,7 @@ void MusBrowserCompositorOutputSurface::SwapBuffers(
background_color, vertex_opacity, y_flipped, nearest_neighbor,
secure_output_only);
- ui_frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
+ ui_frame.render_pass_list.push_back(std::move(pass));
ui_compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
return;
}

Powered by Google App Engine
This is Rietveld 408576698