| Index: cc/layers/layer_iterator_unittest.cc
|
| diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
|
| index 1d71b1243ab89963c36ccff7b3ba7c6572127258..b7757670babf3e47d9109ec015378412dde31587 100644
|
| --- a/cc/layers/layer_iterator_unittest.cc
|
| +++ b/cc/layers/layer_iterator_unittest.cc
|
| @@ -130,13 +130,13 @@ TEST_F(LayerIteratorTest, SimpleTree) {
|
| TestLayerImpl* third_ptr = third.get();
|
| TestLayerImpl* fourth_ptr = fourth.get();
|
|
|
| - root_layer->AddChild(first.Pass());
|
| - root_layer->AddChild(second.Pass());
|
| - root_layer->AddChild(third.Pass());
|
| - root_layer->AddChild(fourth.Pass());
|
| + root_layer->AddChild(std::move(first));
|
| + root_layer->AddChild(std::move(second));
|
| + root_layer->AddChild(std::move(third));
|
| + root_layer->AddChild(std::move(fourth));
|
|
|
| root_layer->SetHasRenderSurface(true);
|
| - host_impl_.active_tree()->SetRootLayer(root_layer.Pass());
|
| + host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
|
|
|
| LayerImplList render_surface_layer_list;
|
| LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
|
| @@ -172,17 +172,17 @@ TEST_F(LayerIteratorTest, ComplexTree) {
|
| TestLayerImpl* root221_ptr = root221.get();
|
| TestLayerImpl* root231_ptr = root231.get();
|
|
|
| - root22->AddChild(root221.Pass());
|
| - root23->AddChild(root231.Pass());
|
| - root2->AddChild(root21.Pass());
|
| - root2->AddChild(root22.Pass());
|
| - root2->AddChild(root23.Pass());
|
| - root_layer->AddChild(root1.Pass());
|
| - root_layer->AddChild(root2.Pass());
|
| - root_layer->AddChild(root3.Pass());
|
| + root22->AddChild(std::move(root221));
|
| + root23->AddChild(std::move(root231));
|
| + root2->AddChild(std::move(root21));
|
| + root2->AddChild(std::move(root22));
|
| + root2->AddChild(std::move(root23));
|
| + root_layer->AddChild(std::move(root1));
|
| + root_layer->AddChild(std::move(root2));
|
| + root_layer->AddChild(std::move(root3));
|
|
|
| root_layer->SetHasRenderSurface(true);
|
| - host_impl_.active_tree()->SetRootLayer(root_layer.Pass());
|
| + host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
|
|
|
| LayerImplList render_surface_layer_list;
|
| LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
|
| @@ -223,20 +223,20 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
|
| TestLayerImpl* root231_ptr = root231.get();
|
|
|
| root22->SetHasRenderSurface(true);
|
| - root22->AddChild(root221.Pass());
|
| + root22->AddChild(std::move(root221));
|
| root23->SetHasRenderSurface(true);
|
| - root23->AddChild(root231.Pass());
|
| + root23->AddChild(std::move(root231));
|
| root2->SetDrawsContent(false);
|
| root2->SetHasRenderSurface(true);
|
| - root2->AddChild(root21.Pass());
|
| - root2->AddChild(root22.Pass());
|
| - root2->AddChild(root23.Pass());
|
| - root_layer->AddChild(root1.Pass());
|
| - root_layer->AddChild(root2.Pass());
|
| - root_layer->AddChild(root3.Pass());
|
| + root2->AddChild(std::move(root21));
|
| + root2->AddChild(std::move(root22));
|
| + root2->AddChild(std::move(root23));
|
| + root_layer->AddChild(std::move(root1));
|
| + root_layer->AddChild(std::move(root2));
|
| + root_layer->AddChild(std::move(root3));
|
|
|
| root_layer->SetHasRenderSurface(true);
|
| - host_impl_.active_tree()->SetRootLayer(root_layer.Pass());
|
| + host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
|
|
|
| LayerImplList render_surface_layer_list;
|
| LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
|
|
|