Make cc::CompositorFrames movable [Part 1 of 2]

cc/surfaces/surface_aggregator_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 125 matching lines @@
       EXPECT_TRUE(
           aggregator_.previous_contained_surfaces().find(surface_ids[i]) !=
           aggregator_.previous_contained_surfaces().end());
     }
   }
 
   void SubmitPassListAsFrame(SurfaceId surface_id, RenderPassList* pass_list) {
     std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     pass_list->swap(frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
     frame->delegated_frame_data = std::move(frame_data);
 
     factory_.SubmitCompositorFrame(surface_id, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   void SubmitCompositorFrame(test::Pass* passes,
                              size_t pass_count,
                              SurfaceId surface_id) {
     RenderPassList pass_list;
     AddPasses(&pass_list, gfx::Rect(SurfaceSize()), passes, pass_count);
     SubmitPassListAsFrame(surface_id, &pass_list);
   }
 
   void QueuePassAsFrame(std::unique_ptr<RenderPass> pass,
                         SurfaceId surface_id) {
     std::unique_ptr<DelegatedFrameData> delegated_frame_data(
         new DelegatedFrameData);
     delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
-    std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> child_frame(CompositorFrame::Create());
     child_frame->delegated_frame_data = std::move(delegated_frame_data);
 
     factory_.SubmitCompositorFrame(surface_id, std::move(child_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
  protected:
   SurfaceId root_surface_id_;
   Surface* root_surface_;
   SurfaceIdAllocator allocator_;
@@ skipping 196 matching lines @@
     AddPasses(&pass_list,
               gfx::Rect(SurfaceSize()),
               root_passes,
               arraysize(root_passes));
     pass_list[0]->copy_requests.push_back(std::move(copy_request));
     pass_list[1]->copy_requests.push_back(std::move(copy_request2));
 
     std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     pass_list.swap(frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
     frame->delegated_frame_data = std::move(frame_data);
 
     factory_.SubmitCompositorFrame(root_surface_id_, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   std::unique_ptr<CompositorFrame> aggregated_frame =
       aggregator_.Aggregate(root_surface_id_);
 
   ASSERT_TRUE(aggregated_frame);
@@ skipping 63 matching lines @@
       test::Quad::SurfaceQuad(embedded_surface_id, 1.f),
       test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass parent_passes[] = {
       test::Pass(parent_quads, arraysize(parent_quads))};
 
   {
     std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()),
               parent_passes, arraysize(parent_passes));
 
-    std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
     frame->delegated_frame_data = std::move(frame_data);
     frame->metadata.referenced_surfaces.push_back(embedded_surface_id);
 
     factory_.SubmitCompositorFrame(parent_surface_id, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
                              test::Quad::SolidColorQuad(SK_ColorBLACK)};
   test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))};
 
   {
     std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()),
               root_passes, arraysize(root_passes));
 
-    std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
     frame->delegated_frame_data = std::move(frame_data);
     frame->metadata.referenced_surfaces.push_back(parent_surface_id);
     // Reference to Surface ID of a Surface that doesn't exist should be
     // included in previous_contained_surfaces, but otherwise ignored.
     frame->metadata.referenced_surfaces.push_back(nonexistent_surface_id);
 
     factory_.SubmitCompositorFrame(root_surface_id_, std::move(frame),
                                    SurfaceFactory::DrawCallback());
   }
 
@@ skipping 538 matching lines @@
     SharedQuadState* child_root_pass_sqs =
         child_root_pass->shared_quad_state_list.front();
     child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
     child_root_pass_sqs->is_clipped = true;
     child_root_pass_sqs->clip_rect = gfx::Rect(0, 0, 5, 5);
 
     std::unique_ptr<DelegatedFrameData> child_frame_data(
         new DelegatedFrameData);
     child_pass_list.swap(child_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> child_frame(CompositorFrame::Create());
     child_frame->delegated_frame_data = std::move(child_frame_data);
 
     factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   // Middle child surface.
   SurfaceId middle_surface_id = allocator_.GenerateId();
   factory_.Create(middle_surface_id);
   {
@@ skipping 11 matching lines @@
     middle_root_pass->quad_list.ElementAt(0)->visible_rect =
         gfx::Rect(0, 1, 100, 7);
     SharedQuadState* middle_root_pass_sqs =
         middle_root_pass->shared_quad_state_list.front();
     middle_root_pass_sqs->quad_to_target_transform.Scale(2, 3);
 
     std::unique_ptr<DelegatedFrameData> middle_frame_data(
         new DelegatedFrameData);
     middle_pass_list.swap(middle_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> middle_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> middle_frame(CompositorFrame::Create());
     middle_frame->delegated_frame_data = std::move(middle_frame_data);
 
     factory_.SubmitCompositorFrame(middle_surface_id, std::move(middle_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   // Root surface.
   test::Quad secondary_quads[] = {
       test::Quad::SolidColorQuad(1),
       test::Quad::SurfaceQuad(middle_surface_id, 1.f)};
@@ skipping 15 matching lines @@
       ->shared_quad_state_list.ElementAt(1)
       ->quad_to_target_transform.Translate(0, 10);
   root_pass_list[0]->quad_list.ElementAt(1)->visible_rect =
       gfx::Rect(0, 0, 8, 100);
 
   root_pass_list[0]->transform_to_root_target.Translate(10, 5);
 
   std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
   root_pass_list.swap(root_frame_data->render_pass_list);
 
-  std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
   root_frame->delegated_frame_data = std::move(root_frame_data);
 
   factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
                                  SurfaceFactory::DrawCallback());
 
   std::unique_ptr<CompositorFrame> aggregated_frame =
       aggregator_.Aggregate(root_surface_id_);
 
   ASSERT_TRUE(aggregated_frame);
   ASSERT_TRUE(aggregated_frame->delegated_frame_data);
@@ skipping 86 matching lines @@
             arraysize(child_passes));
 
   RenderPass* child_root_pass = child_pass_list[0].get();
   SharedQuadState* child_root_pass_sqs =
       child_root_pass->shared_quad_state_list.front();
   child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
 
   std::unique_ptr<DelegatedFrameData> child_frame_data(new DelegatedFrameData);
   child_pass_list.swap(child_frame_data->render_pass_list);
 
-  std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> child_frame(CompositorFrame::Create());
   child_frame->delegated_frame_data = std::move(child_frame_data);
 
   SurfaceId child_surface_id = allocator_.GenerateId();
   factory_.Create(child_surface_id);
   factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
                                  SurfaceFactory::DrawCallback());
 
   test::Quad parent_surface_quads[] = {
       test::Quad::SurfaceQuad(child_surface_id, 1.f)};
   test::Pass parent_surface_passes[] = {
       test::Pass(parent_surface_quads, arraysize(parent_surface_quads),
                  RenderPassId(1, 1))};
 
   RenderPassList parent_surface_pass_list;
   AddPasses(&parent_surface_pass_list,
             gfx::Rect(SurfaceSize()),
             parent_surface_passes,
             arraysize(parent_surface_passes));
 
   // Parent surface is only used to test if the transform is applied correctly
   // to the child surface's damage.
   std::unique_ptr<DelegatedFrameData> parent_surface_frame_data(
       new DelegatedFrameData);
   parent_surface_pass_list.swap(parent_surface_frame_data->render_pass_list);
 
-  std::unique_ptr<CompositorFrame> parent_surface_frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> parent_surface_frame(
+      CompositorFrame::Create());
   parent_surface_frame->delegated_frame_data =
       std::move(parent_surface_frame_data);
 
   SurfaceId parent_surface_id = allocator_.GenerateId();
   factory_.Create(parent_surface_id);
   factory_.SubmitCompositorFrame(parent_surface_id,
                                  std::move(parent_surface_frame),
                                  SurfaceFactory::DrawCallback());
 
   test::Quad root_surface_quads[] = {
@@ skipping 15 matching lines @@
 
   root_pass_list[0]
       ->shared_quad_state_list.front()
       ->quad_to_target_transform.Translate(0, 10);
   root_pass_list[0]->damage_rect = gfx::Rect(5, 5, 10, 10);
   root_pass_list[1]->damage_rect = gfx::Rect(5, 5, 100, 100);
 
   std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
   root_pass_list.swap(root_frame_data->render_pass_list);
 
-  std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
   root_frame->delegated_frame_data = std::move(root_frame_data);
 
   factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
                                  SurfaceFactory::DrawCallback());
 
   std::unique_ptr<CompositorFrame> aggregated_frame =
       aggregator_.Aggregate(root_surface_id_);
 
   ASSERT_TRUE(aggregated_frame);
   ASSERT_TRUE(aggregated_frame->delegated_frame_data);
@@ skipping 17 matching lines @@
     RenderPass* child_root_pass = child_pass_list[0].get();
     SharedQuadState* child_root_pass_sqs =
         child_root_pass->shared_quad_state_list.front();
     child_root_pass_sqs->quad_to_target_transform.Translate(8, 0);
     child_root_pass->damage_rect = gfx::Rect(10, 10, 10, 10);
 
     std::unique_ptr<DelegatedFrameData> child_frame_data(
         new DelegatedFrameData);
     child_pass_list.swap(child_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> child_frame(CompositorFrame::Create());
     child_frame->delegated_frame_data = std::move(child_frame_data);
 
     factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
                                    SurfaceFactory::DrawCallback());
 
     std::unique_ptr<CompositorFrame> aggregated_frame =
         aggregator_.Aggregate(root_surface_id_);
 
     ASSERT_TRUE(aggregated_frame);
     ASSERT_TRUE(aggregated_frame->delegated_frame_data);
@@ skipping 19 matching lines @@
               arraysize(root_passes));
 
     root_pass_list[0]
         ->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(0, 10);
     root_pass_list[0]->damage_rect = gfx::Rect(0, 0, 1, 1);
 
     std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
     root_pass_list.swap(root_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
     root_frame->delegated_frame_data = std::move(root_frame_data);
 
     factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
   }
 
   {
     RenderPassList root_pass_list;
     AddPasses(&root_pass_list,
               gfx::Rect(SurfaceSize()),
               root_passes,
               arraysize(root_passes));
 
     root_pass_list[0]
         ->shared_quad_state_list.front()
         ->quad_to_target_transform.Translate(0, 10);
     root_pass_list[0]->damage_rect = gfx::Rect(1, 1, 1, 1);
 
     std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
     root_pass_list.swap(root_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
     root_frame->delegated_frame_data = std::move(root_frame_data);
 
     factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
 
     std::unique_ptr<CompositorFrame> aggregated_frame =
         aggregator_.Aggregate(root_surface_id_);
 
     ASSERT_TRUE(aggregated_frame);
     ASSERT_TRUE(aggregated_frame->delegated_frame_data);
@@ skipping 64 matching lines @@
 
   RenderPassList root_pass_list;
   AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,
             arraysize(root_passes));
 
   root_pass_list[0]->damage_rect = gfx::Rect(5, 5, 100, 100);
 
   std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
   root_pass_list.swap(root_frame_data->render_pass_list);
 
-  std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
   root_frame->delegated_frame_data = std::move(root_frame_data);
 
   factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
                                  SurfaceFactory::DrawCallback());
 
   {
     std::unique_ptr<CompositorFrame> aggregated_frame =
         aggregator_.Aggregate(root_surface_id_);
 
     ASSERT_TRUE(aggregated_frame);
@@ skipping 21 matching lines @@
 
     RenderPassList root_pass_list;
     AddPasses(&root_pass_list, gfx::Rect(SurfaceSize()), root_passes,
               arraysize(root_passes));
 
     root_pass_list[0]->damage_rect = gfx::Rect(1, 2, 3, 4);
 
     std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
     root_pass_list.swap(root_frame_data->render_pass_list);
 
-    std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> root_frame(CompositorFrame::Create());
     root_frame->delegated_frame_data = std::move(root_frame_data);
 
     factory_.Create(second_root_surface_id);
     factory_.SubmitCompositorFrame(second_root_surface_id,
                                    std::move(root_frame),
                                    SurfaceFactory::DrawCallback());
     factory_.SetPreviousFrameSurface(second_root_surface_id, root_surface_id_);
   }
   {
     std::unique_ptr<CompositorFrame> aggregated_frame =
@@ skipping 425 matching lines @@
     const float vertex_opacity[4] = {0.f, 0.f, 1.f, 1.f};
     bool flipped = false;
     bool nearest_neighbor = false;
     bool secure_output_only = true;
     quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
                  resource_ids[i], gfx::Size(), premultiplied_alpha, uv_top_left,
                  uv_bottom_right, background_color, vertex_opacity, flipped,
                  nearest_neighbor, secure_output_only);
   }
   frame_data->render_pass_list.push_back(std::move(pass));
-  std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
   frame->delegated_frame_data = std::move(frame_data);
   factory->SubmitCompositorFrame(surface_id, std::move(frame),
                                  SurfaceFactory::DrawCallback());
 }
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
   ResourceTrackingSurfaceFactoryClient client;
   SurfaceFactory factory(&manager_, &client);
   SurfaceId surface_id(0, 7u, 0);
   factory.Create(surface_id);
@@ skipping 31 matching lines @@
   std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
   pass->id = RenderPassId(1, 1);
   TransferableResource resource;
   resource.id = 11;
   // ResourceProvider is software but resource is not, so it should be
   // ignored.
   resource.is_software = false;
   frame_data->resource_list.push_back(resource);
   frame_data->render_pass_list.push_back(std::move(pass));
-  std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+  std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
   frame->delegated_frame_data = std::move(frame_data);
   factory.SubmitCompositorFrame(surface_id, std::move(frame),
                                 SurfaceFactory::DrawCallback());
 
   std::unique_ptr<CompositorFrame> returned_frame =
       aggregator_->Aggregate(surface_id);
 
   // Nothing should be available to be returned yet.
   EXPECT_TRUE(client.returned_resources().empty());
 
@@ skipping 120 matching lines @@
     pass->id = RenderPassId(1, 1);
     SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
     sqs->opacity = 1.f;
     SurfaceDrawQuad* surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
     surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
                          surface1_id);
     pass->copy_requests.push_back(CopyOutputRequest::CreateEmptyRequest());
 
     frame_data->render_pass_list.push_back(std::move(pass));
-    std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+    std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create());
     frame->delegated_frame_data = std::move(frame_data);
     factory.SubmitCompositorFrame(surface2_id, std::move(frame),
                                   SurfaceFactory::DrawCallback());
   }
 
   frame = aggregator_->Aggregate(surface2_id);
   EXPECT_EQ(1u, frame->delegated_frame_data->render_pass_list.size());
   render_pass = frame->delegated_frame_data->render_pass_list.front().get();
 
   // Parent has copy request, so texture should not be drawn.
@@ skipping 15 matching lines @@
   // Output is insecure, so texture should be drawn.
   EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
 
   factory.Destroy(surface1_id);
   factory.Destroy(surface2_id);
 }
 
 }  // namespace
 }  // namespace cc