From a04855af140e24ed3ec3f59da178837b3d32d9c4 Mon Sep 17 00:00:00 2001
From: danakj <danakj@chromium.org>
Date: Wed, 18 Nov 2015 12:39:10 -0800
Subject: cc: Replace Pass() with std::move() in some subdirs.

This hits the following:
cc/layers/
cc/output/
cc/quads/
cc/resources/
cc/scheduler/
cc/surfaces/
cc/trees/

R=enne, vmpstr
BUG=557422
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1455023002

Cr-Commit-Position: refs/heads/master@{#360405}
---
 cc/quads/draw_polygon.cc         | 10 +++++-----
 cc/quads/render_pass.cc          |  4 ++--
 cc/quads/render_pass_unittest.cc |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'cc/quads')

diff --git a/cc/quads/draw_polygon.cc b/cc/quads/draw_polygon.cc
index fc9876e..b4f132a 100644
--- a/cc/quads/draw_polygon.cc
+++ b/cc/quads/draw_polygon.cc
@@ -85,7 +85,7 @@ scoped_ptr<DrawPolygon> DrawPolygon::CreateCopy() {
   new_polygon->normal_.set_x(normal_.x());
   new_polygon->normal_.set_y(normal_.y());
   new_polygon->normal_.set_z(normal_.z());
-  return new_polygon.Pass();
+  return new_polygon;
 }
 
 float DrawPolygon::SignedPointDistance(const gfx::Point3F& point) const {
@@ -294,11 +294,11 @@ bool DrawPolygon::Split(const DrawPolygon& splitter,
   DCHECK_GE(poly2->points().size(), 3u);
 
   if (SideCompare(*poly1, splitter) == BSP_FRONT) {
-    *front = poly1.Pass();
-    *back = poly2.Pass();
+    *front = std::move(poly1);
+    *back = std::move(poly2);
   } else {
-    *front = poly2.Pass();
-    *back = poly1.Pass();
+    *front = std::move(poly2);
+    *back = std::move(poly1);
   }
   return true;
 }
diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc
index 3737f3c..ba5806f 100644
--- a/cc/quads/render_pass.cc
+++ b/cc/quads/render_pass.cc
@@ -88,7 +88,7 @@ scoped_ptr<RenderPass> RenderPass::Copy(RenderPassId new_id) const {
                     damage_rect,
                     transform_to_root_target,
                     has_transparent_background);
-  return copy_pass.Pass();
+  return copy_pass;
 }
 
 // static
@@ -134,7 +134,7 @@ void RenderPass::CopyAll(const std::vector<scoped_ptr<RenderPass>>& in,
         copy_pass->CopyFromAndAppendDrawQuad(quad, copy_shared_quad_state);
       }
     }
-    out->push_back(copy_pass.Pass());
+    out->push_back(std::move(copy_pass));
   }
 }
 
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index d4c0bc7..f00c006 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -220,8 +220,8 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
                     gfx::Vector2dF(),
                     FilterOperations());
 
-  pass_list.push_back(pass.Pass());
-  pass_list.push_back(contrib.Pass());
+  pass_list.push_back(std::move(pass));
+  pass_list.push_back(std::move(contrib));
 
   // Make a copy with CopyAll().
   RenderPassList copy_list;
@@ -303,7 +303,7 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
                       gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3), SkColor(),
                       false);
 
-  pass_list.push_back(pass.Pass());
+  pass_list.push_back(std::move(pass));
 
   // Make a copy with CopyAll().
   RenderPassList copy_list;
-- 
cgit v1.1