summaryrefslogtreecommitdiffstats
path: root/cc/quads/draw_polygon.cc
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2014-09-26 19:39:25 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-27 02:39:41 +0000
commit7bb3dbede19d87f0338797756ffd738adc6bca08 (patch)
treeecd66a8fe850e5c57833a673fb39c41dbe27ffeb /cc/quads/draw_polygon.cc
parenta60566701028a7344d17826076780eeb84b63052 (diff)
downloadchromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.zip
chromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.tar.gz
chromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.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 Review URL: https://codereview.chromium.org/609663003 Cr-Commit-Position: refs/heads/master@{#297096}
Diffstat (limited to 'cc/quads/draw_polygon.cc')
-rw-r--r--cc/quads/draw_polygon.cc4
1 files changed, 2 insertions, 2 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 {