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

Unified Diff: cc/surfaces/surface_display_output_surface.cc

Issue 2103333002: Revert of Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/surfaces/surface_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_display_output_surface.cc
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc
index 6dc569c724efd703f6f1a0a39886f2e57f26b2de..79b58119c60ebef6169ac700ea1d9b1aa6eb3953 100644
--- a/cc/surfaces/surface_display_output_surface.cc
+++ b/cc/surfaces/surface_display_output_surface.cc
@@ -76,8 +76,10 @@
client_->DidSwapBuffers();
+ std::unique_ptr<CompositorFrame> frame_copy(new CompositorFrame);
+ *frame_copy = std::move(frame);
factory_.SubmitCompositorFrame(
- delegated_surface_id_, std::move(frame),
+ delegated_surface_id_, std::move(frame_copy),
base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
base::Unretained(this)));
}
@@ -105,7 +107,7 @@
void SurfaceDisplayOutputSurface::ForceReclaimResources() {
if (!delegated_surface_id_.is_null()) {
- factory_.SubmitCompositorFrame(delegated_surface_id_, CompositorFrame(),
+ factory_.SubmitCompositorFrame(delegated_surface_id_, nullptr,
SurfaceFactory::DrawCallback());
}
}
« no previous file with comments | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/surfaces/surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698