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

cc/output/delegating_renderer_unittest.cc

 // Copyright 2013 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/output/delegating_renderer.h"
 
 #include <stdint.h>
 
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/layer_tree_test.h"
@@ skipping 26 matching lines @@
     PostSetNeedsCommitToMainThread();
   }
 
   void AfterTest() override {}
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame,
                                    DrawResult draw_result) override {
     EXPECT_EQ(0u, output_surface_->num_sent_frames());
 
-    const CompositorFrame& last_frame = output_surface_->last_sent_frame();
-    EXPECT_FALSE(last_frame.delegated_frame_data);
-    EXPECT_FALSE(last_frame.gl_frame_data);
-    EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor);
-    EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor);
+    const CompositorFrame* last_frame = output_surface_->last_sent_frame();
+    EXPECT_FALSE(last_frame->delegated_frame_data);
+    EXPECT_FALSE(last_frame->gl_frame_data);
+    EXPECT_EQ(0.f, last_frame->metadata.min_page_scale_factor);
+    EXPECT_EQ(0.f, last_frame->metadata.max_page_scale_factor);
     return DRAW_SUCCESS;
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     EXPECT_EQ(0u, output_surface_->num_sent_frames());
   }
 
   void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
     EXPECT_TRUE(result);
     EXPECT_EQ(1u, output_surface_->num_sent_frames());
 
-    const CompositorFrame& last_frame = output_surface_->last_sent_frame();
-    DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get();
-    ASSERT_TRUE(last_frame.delegated_frame_data);
-    EXPECT_FALSE(last_frame.gl_frame_data);
+    const CompositorFrame* last_frame = output_surface_->last_sent_frame();
+    DelegatedFrameData* last_frame_data =
+        last_frame->delegated_frame_data.get();
+    ASSERT_TRUE(last_frame->delegated_frame_data);
+    EXPECT_FALSE(last_frame->gl_frame_data);
     EXPECT_EQ(host_impl->DeviceViewport().ToString(),
               last_frame_data->render_pass_list.back()->output_rect.ToString());
-    EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor);
-    EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor);
+    EXPECT_EQ(0.5f, last_frame->metadata.min_page_scale_factor);
+    EXPECT_EQ(4.f, last_frame->metadata.max_page_scale_factor);
 
-    EXPECT_EQ(
-        0u, last_frame.delegated_frame_data->resource_list.size());
-    EXPECT_EQ(1u, last_frame.delegated_frame_data->render_pass_list.size());
+    EXPECT_EQ(0u, last_frame->delegated_frame_data->resource_list.size());
+    EXPECT_EQ(1u, last_frame->delegated_frame_data->render_pass_list.size());
 
     EndTest();
   }
 };
 
 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw);
 
 class DelegatingRendererTestResources : public DelegatingRendererTest {
  public:
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
@@ skipping 20 matching lines @@
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     EXPECT_EQ(0u, output_surface_->num_sent_frames());
   }
 
   void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
     EXPECT_TRUE(result);
     EXPECT_EQ(1u, output_surface_->num_sent_frames());
 
-    const CompositorFrame& last_frame = output_surface_->last_sent_frame();
-    ASSERT_TRUE(last_frame.delegated_frame_data);
+    CompositorFrame* last_frame = output_surface_->last_sent_frame();

[danakj, 2016/06/24 20:20:43]

nit: can stay const

[Fady Samuel, 2016/06/24 21:31:15]

Done.

+    ASSERT_TRUE(last_frame->delegated_frame_data);
 
-    EXPECT_EQ(2u, last_frame.delegated_frame_data->render_pass_list.size());
+    EXPECT_EQ(2u, last_frame->delegated_frame_data->render_pass_list.size());
     // Each render pass has 10 resources in it. And the root render pass has a
     // mask resource used when drawing the child render pass, as well as its
     // replica (it's added twice). The number 10 may change if
     // AppendOneOfEveryQuadType() is updated, and the value here should be
     // updated accordingly.
-    EXPECT_EQ(22u, last_frame.delegated_frame_data->resource_list.size());
+    EXPECT_EQ(22u, last_frame->delegated_frame_data->resource_list.size());
 
     EndTest();
   }
 };
 
 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(
     DelegatingRendererTestResources);
 
 }  // namespace cc