cc: Replace Pass() with std::move() in some subdirs.

cc/trees/damage_tracker_unittest.cc

 // Copyright 2011 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/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
@@ skipping 80 matching lines @@
 
     root->SetPosition(gfx::PointF());
     root->SetBounds(gfx::Size(500, 500));
     root->SetDrawsContent(true);
     root->SetHasRenderSurface(true);
     root->render_surface()->SetContentRect(gfx::Rect(0, 0, 500, 500));
 
     child->SetPosition(gfx::PointF(100.f, 100.f));
     child->SetBounds(gfx::Size(30, 30));
     child->SetDrawsContent(true);
-    root->AddChild(child.Pass());
+    root->AddChild(std::move(child));
 
-    return root.Pass();
+    return root;
   }
 
   scoped_ptr<LayerImpl> CreateTestTreeWithTwoSurfaces() {
     // This test tree has two render surfaces: one for the root, and one for
     // child1. Additionally, the root has a second child layer, and child1 has
     // two children of its own.
 
     scoped_ptr<LayerImpl> root =
             LayerImpl::Create(host_impl_.active_tree(), 1);
     scoped_ptr<LayerImpl> child1 =
@@ skipping 24 matching lines @@
     child2->SetDrawsContent(true);
 
     grand_child1->SetPosition(gfx::PointF(200.f, 200.f));
     grand_child1->SetBounds(gfx::Size(6, 8));
     grand_child1->SetDrawsContent(true);
 
     grand_child2->SetPosition(gfx::PointF(190.f, 190.f));
     grand_child2->SetBounds(gfx::Size(6, 8));
     grand_child2->SetDrawsContent(true);
 
-    child1->AddChild(grand_child1.Pass());
-    child1->AddChild(grand_child2.Pass());
-    root->AddChild(child1.Pass());
-    root->AddChild(child2.Pass());
+    child1->AddChild(std::move(grand_child1));
+    child1->AddChild(std::move(grand_child2));
+    root->AddChild(std::move(child1));
+    root->AddChild(std::move(child2));
 
-    return root.Pass();
+    return root;
   }
 
   scoped_ptr<LayerImpl> CreateAndSetUpTestTreeWithOneSurface() {
     scoped_ptr<LayerImpl> root = CreateTestTreeWithOneSurface();
 
     // Setup includes going past the first frame which always damages
     // everything, so that we can actually perform specific tests.
     EmulateDrawingOneFrame(root.get());
 
-    return root.Pass();
+    return root;
   }
 
   scoped_ptr<LayerImpl> CreateAndSetUpTestTreeWithTwoSurfaces() {
     scoped_ptr<LayerImpl> root = CreateTestTreeWithTwoSurfaces();
 
     // Setup includes going past the first frame which always damages
     // everything, so that we can actually perform specific tests.
     EmulateDrawingOneFrame(root.get());
 
-    return root.Pass();
+    return root;
   }
 
  protected:
   FakeImplTaskRunnerProvider task_runner_provider_;
   TestSharedBitmapManager shared_bitmap_manager_;
   TestTaskGraphRunner task_graph_runner_;
   FakeLayerTreeHostImpl host_impl_;
 };
 
 TEST_F(DamageTrackerTest, SanityCheckTestTreeWithOneSurface) {
@@ skipping 527 matching lines @@
 
   // CASE 1: Adding a new layer should cause the appropriate damage.
   //
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
-    root->AddChild(child2.Pass());
+    root->AddChild(std::move(child2));
   }
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
   ASSERT_EQ(3u, root->render_surface()->layer_list().size());
 
   gfx::Rect root_damage_rect =
       root->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
@@ skipping 33 matching lines @@
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
     child2->ResetAllChangeTrackingForSubtree();
     // Sanity check the initial conditions of the test, if these asserts
     // trigger, it means the test no longer actually covers the intended
     // scenario.
     ASSERT_FALSE(child2->LayerPropertyChanged());
     ASSERT_TRUE(child2->update_rect().IsEmpty());
-    root->AddChild(child2.Pass());
+    root->AddChild(std::move(child2));
   }
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
   ASSERT_EQ(3u, root->render_surface()->layer_list().size());
 
   gfx::Rect root_damage_rect =
       root->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageForMultipleLayers) {
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child1 = root->children()[0].get();
 
   // In this test we don't want the above tree manipulation to be considered
   // part of the same frame.
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
-    root->AddChild(child2.Pass());
+    root->AddChild(std::move(child2));
   }
   LayerImpl* child2 = root->children()[1].get();
   EmulateDrawingOneFrame(root.get());
 
   // Damaging two layers simultaneously should cause combined damage.
   // - child1 update rect in surface space: gfx::Rect(100, 100, 1, 2);
   // - child2 update rect in surface space: gfx::Rect(400, 380, 3, 4);
   ClearDamageForAllSurfaces(root.get());
   child1->SetUpdateRect(gfx::Rect(1, 2));
   child2->SetUpdateRect(gfx::Rect(3, 4));
@@ skipping 228 matching lines @@
   // For this test case, we modify grand_child2, and add grand_child3 to extend
   // the bounds of child1's surface. This way, we can test reflection changes
   // without changing content_bounds of the surface.
   grand_child2->SetPosition(gfx::PointF(180.f, 180.f));
   {
     scoped_ptr<LayerImpl> grand_child3 =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child3->SetPosition(gfx::PointF(240.f, 240.f));
     grand_child3->SetBounds(gfx::Size(10, 10));
     grand_child3->SetDrawsContent(true);
-    child1->AddChild(grand_child3.Pass());
+    child1->AddChild(std::move(grand_child3));
   }
   child1->SetOpacity(0.5f);
   EmulateDrawingOneFrame(root.get());
 
   // CASE 1: adding a reflection about the left edge of grand_child1.
   //
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     grand_child1_replica->SetPosition(gfx::PointF());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
-    grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
+    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
     grand_child1->SetHasRenderSurface(true);
   }
   EmulateDrawingOneFrame(root.get());
 
   gfx::Rect grand_child_damage_rect =
       grand_child1->render_surface()->damage_tracker()->current_damage_rect();
   gfx::Rect child_damage_rect =
       child1->render_surface()->damage_tracker()->current_damage_rect();
   gfx::Rect root_damage_rect =
       root->render_surface()->damage_tracker()->current_damage_rect();
@@ skipping 64 matching lines @@
   // layers should damage the entire corresponding surface.
 
   ClearDamageForAllSurfaces(root.get());
 
   // Set up the mask layer.
   {
     scoped_ptr<LayerImpl> mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     mask_layer->SetPosition(child->position());
     mask_layer->SetBounds(child->bounds());
-    child->SetMaskLayer(mask_layer.Pass());
+    child->SetMaskLayer(std::move(mask_layer));
     child->SetHasRenderSurface(true);
   }
   LayerImpl* mask_layer = child->mask_layer();
 
   // Add opacity and a grand_child so that the render surface persists even
   // after we remove the mask.
   {
     scoped_ptr<LayerImpl> grand_child =
             LayerImpl::Create(host_impl_.active_tree(), 4);
     grand_child->SetPosition(gfx::PointF(2.f, 2.f));
     grand_child->SetBounds(gfx::Size(2, 2));
     grand_child->SetDrawsContent(true);
-    child->AddChild(grand_child.Pass());
+    child->AddChild(std::move(grand_child));
   }
   EmulateDrawingOneFrame(root.get());
 
   // CASE 1: the update_rect on a mask layer should damage the entire target
   //         surface.
   ClearDamageForAllSurfaces(root.get());
   mask_layer->SetUpdateRect(gfx::Rect(1, 2, 3, 4));
   EmulateDrawingOneFrame(root.get());
   gfx::Rect child_damage_rect =
       child->render_surface()->damage_tracker()->current_damage_rect();
@@ skipping 55 matching lines @@
   ClearDamageForAllSurfaces(root.get());
 
   // Create a reflection about the left edge of grand_child1.
   {
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child1_replica->SetPosition(gfx::PointF());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
-    grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
+    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
     grand_child1->SetHasRenderSurface(true);
   }
   LayerImpl* grand_child1_replica = grand_child1->replica_layer();
 
   // Set up the mask layer on the replica layer
   {
     scoped_ptr<LayerImpl> replica_mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
     replica_mask_layer->SetBounds(grand_child1->bounds());
-    grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass());
+    grand_child1_replica->SetMaskLayer(std::move(replica_mask_layer));
   }
   LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
 
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
 
   // CASE 1: a property change on the mask should damage only the reflected
   //         region on the target surface.
@@ skipping 45 matching lines @@
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child1_replica->SetPosition(gfx::PointF());
 
     // This is the anchor being tested.
     grand_child1_replica->SetTransformOrigin(
         gfx::Point3F(grand_child1->bounds().width(), 0.f, 0.f));
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
-    grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
+    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
     grand_child1->SetHasRenderSurface(true);
   }
   LayerImpl* grand_child1_replica = grand_child1->replica_layer();
 
   // Set up the mask layer on the replica layer
   {
     scoped_ptr<LayerImpl> replica_mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
     // Note: this is not the transform origin being tested.
     replica_mask_layer->SetBounds(grand_child1->bounds());
-    grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass());
+    grand_child1_replica->SetMaskLayer(std::move(replica_mask_layer));
   }
   LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
 
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
 
   // A property change on the replica_mask should damage the reflected region on
   // the target surface.
@@ skipping 127 matching lines @@
     gfx::Rect root_damage_rect =
         root->render_surface()->damage_tracker()->current_damage_rect();
     gfx::Rect damage_we_care_about = gfx::Rect(i, i);
     EXPECT_LE(damage_we_care_about.right(), root_damage_rect.right());
     EXPECT_LE(damage_we_care_about.bottom(), root_damage_rect.bottom());
   }
 }
 
 }  // namespace
 }  // namespace cc