diff options
author | danakj <danakj@chromium.org> | 2014-09-27 14:55:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-27 21:56:07 +0000 |
commit | f446a070a0aa29a153b0cf78b33ef22da84cb023 (patch) | |
tree | 58723080156284eca6c914ec067cbf93afac948b /cc/quads | |
parent | ea60a8e76d887c6b22acc495e5ea3c28540ae2ef (diff) | |
download | chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.zip chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.tar.gz chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.tar.bz2 |
cc: Remove use of PassAs() and constructor-casting with scoped_ptr.
Say you have class A and subclass B.
Previously it was required to PassAs() a scoped_ptr<B> into a
scoped_ptr<A>. This is no longer needed, so just use Pass(). For newly
created scoped_ptrs, you can just use make_scoped_ptr always now.
And when you want to return or assign an empty scoped_ptr(), you can
now use nullptr directly.
Also adds PRESUBMIT checks for:
- return scoped<T>(foo). This should be return make_scoped_ptr(foo).
- bar = scoped<T>(foo). This should be return bar = make_scoped_ptr(foo).
- return scoped<T>(). This should be return nullptr.
- bar = scoped<T>(). This should be return bar = nullptr.
This also replaces p.reset() with p = nullptr; But it does not add a
PRESUBMIT check for that because there are things other than scoped_ptr
with a reset() function.
R=enne@chromium.org
Committed: https://crrev.com/7bb3dbede19d87f0338797756ffd738adc6bca08
Cr-Commit-Position: refs/heads/master@{#297096}
Review URL: https://codereview.chromium.org/609663003
Cr-Commit-Position: refs/heads/master@{#297121}
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; |