| Index: cc/surfaces/surface_aggregator_perftest.cc
|
| diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
|
| index 95085c3b634c85b076d4c82cca9bd6b5f403fdaa..c6e4234f79e3720eabaa0c2a6219deb68931521e 100644
|
| --- a/cc/surfaces/surface_aggregator_perftest.cc
|
| +++ b/cc/surfaces/surface_aggregator_perftest.cc
|
| @@ -96,10 +96,10 @@ class SurfaceAggregatorPerfTest : public testing::Test {
|
| SurfaceId(i - 1));
|
| }
|
|
|
| - frame_data->render_pass_list.push_back(pass.Pass());
|
| + frame_data->render_pass_list.push_back(std::move(pass));
|
| scoped_ptr<CompositorFrame> frame(new CompositorFrame);
|
| - frame->delegated_frame_data = frame_data.Pass();
|
| - factory_.SubmitCompositorFrame(SurfaceId(i), frame.Pass(),
|
| + frame->delegated_frame_data = std::move(frame_data);
|
| + factory_.SubmitCompositorFrame(SurfaceId(i), std::move(frame),
|
| SurfaceFactory::DrawCallback());
|
| }
|
|
|
| @@ -120,10 +120,11 @@ class SurfaceAggregatorPerfTest : public testing::Test {
|
| else
|
| pass->damage_rect = gfx::Rect(0, 0, 1, 1);
|
|
|
| - frame_data->render_pass_list.push_back(pass.Pass());
|
| + frame_data->render_pass_list.push_back(std::move(pass));
|
| scoped_ptr<CompositorFrame> frame(new CompositorFrame);
|
| - frame->delegated_frame_data = frame_data.Pass();
|
| - factory_.SubmitCompositorFrame(SurfaceId(num_surfaces + 1), frame.Pass(),
|
| + frame->delegated_frame_data = std::move(frame_data);
|
| + factory_.SubmitCompositorFrame(SurfaceId(num_surfaces + 1),
|
| + std::move(frame),
|
| SurfaceFactory::DrawCallback());
|
|
|
| scoped_ptr<CompositorFrame> aggregated =
|
|
|