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

Unified Diff: cc/test/pixel_test_delegating_output_surface.cc

Issue 2098953003: Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android compiles locally 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
Index: cc/test/pixel_test_delegating_output_surface.cc
diff --git a/cc/test/pixel_test_delegating_output_surface.cc b/cc/test/pixel_test_delegating_output_surface.cc
index dd57248ce2b086120d389c467a6278f6c2471079..cbf3f3964439664369330e3a3c55bfc0bcb2e0eb 100644
--- a/cc/test/pixel_test_delegating_output_surface.cc
+++ b/cc/test/pixel_test_delegating_output_surface.cc
@@ -134,10 +134,8 @@ void PixelTestDelegatingOutputSurface::SwapBuffers(CompositorFrame frame) {
frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
display_->Resize(frame_size);
- std::unique_ptr<CompositorFrame> frame_copy(new CompositorFrame);
- *frame_copy = std::move(frame);
surface_factory_->SubmitCompositorFrame(
- delegated_surface_id_, std::move(frame_copy),
+ delegated_surface_id_, std::move(frame),
base::Bind(&PixelTestDelegatingOutputSurface::DrawCallback,
weak_ptrs_.GetWeakPtr()));
@@ -157,7 +155,8 @@ void PixelTestDelegatingOutputSurface::DrawCallback(SurfaceDrawStatus) {
void PixelTestDelegatingOutputSurface::ForceReclaimResources() {
if (allow_force_reclaim_resources_ && !delegated_surface_id_.is_null()) {
- surface_factory_->SubmitCompositorFrame(delegated_surface_id_, nullptr,
+ surface_factory_->SubmitCompositorFrame(delegated_surface_id_,
+ CompositorFrame(),
SurfaceFactory::DrawCallback());
}
}

Powered by Google App Engine
This is Rietveld 408576698