diff options
Diffstat (limited to 'cc/quads')
| -rw-r--r-- | cc/quads/draw_polygon.cc | 4 | ||||
| -rw-r--r-- | cc/quads/render_pass_unittest.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cc/quads/draw_polygon.cc b/cc/quads/draw_polygon.cc index bfc2b492..71dbf36 100644 --- a/cc/quads/draw_polygon.cc +++ b/cc/quads/draw_polygon.cc @@ -76,7 +76,7 @@ DrawPolygon::~DrawPolygon() { } scoped_ptr<DrawPolygon> DrawPolygon::CreateCopy() { - DrawPolygon* new_polygon = new DrawPolygon(); + scoped_ptr<DrawPolygon> new_polygon(new DrawPolygon()); new_polygon->order_index_ = order_index_; new_polygon->original_ref_ = original_ref_; new_polygon->points_.reserve(points_.size()); @@ -84,7 +84,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 scoped_ptr<DrawPolygon>(new_polygon); + return new_polygon.Pass(); } float DrawPolygon::SignedPointDistance(const gfx::Point3F& point) const { diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc index 3ddf269..36e57d0 100644 --- a/cc/quads/render_pass_unittest.cc +++ b/cc/quads/render_pass_unittest.cc @@ -225,8 +225,8 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) { gfx::Vector2dF(), // filters_scale FilterOperations()); - pass_list.push_back(pass.PassAs<RenderPass>()); - pass_list.push_back(contrib.PassAs<RenderPass>()); + pass_list.push_back(pass.Pass()); + pass_list.push_back(contrib.Pass()); // Make a copy with CopyAll(). RenderPassList copy_list; @@ -310,7 +310,7 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) { gfx::Rect(3, 3, 3, 3), SkColor()); - pass_list.push_back(pass.PassAs<RenderPass>()); + pass_list.push_back(pass.Pass()); // Make a copy with CopyAll(). RenderPassList copy_list; |