From 7bb3dbede19d87f0338797756ffd738adc6bca08 Mon Sep 17 00:00:00 2001
From: danakj <danakj@chromium.org>
Date: Fri, 26 Sep 2014 19:39:25 -0700
Subject: 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}
---
 cc/base/math_util.cc        | 6 +++---
 cc/base/region.cc           | 2 +-
 cc/base/scoped_ptr_vector.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cc/base')

diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc
index 5b01da9..7ed0c9a 100644
--- a/cc/base/math_util.cc
+++ b/cc/base/math_util.cc
@@ -693,7 +693,7 @@ scoped_ptr<base::Value> MathUtil::AsValue(const gfx::Size& s) {
   scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue());
   res->SetDouble("width", s.width());
   res->SetDouble("height", s.height());
-  return res.PassAs<base::Value>();
+  return res.Pass();
 }
 
 scoped_ptr<base::Value> MathUtil::AsValue(const gfx::Rect& r) {
@@ -702,7 +702,7 @@ scoped_ptr<base::Value> MathUtil::AsValue(const gfx::Rect& r) {
   res->AppendInteger(r.y());
   res->AppendInteger(r.width());
   res->AppendInteger(r.height());
-  return res.PassAs<base::Value>();
+  return res.Pass();
 }
 
 bool MathUtil::FromValue(const base::Value* raw_value, gfx::Rect* out_rect) {
@@ -730,7 +730,7 @@ scoped_ptr<base::Value> MathUtil::AsValue(const gfx::PointF& pt) {
   scoped_ptr<base::ListValue> res(new base::ListValue());
   res->AppendDouble(pt.x());
   res->AppendDouble(pt.y());
-  return res.PassAs<base::Value>();
+  return res.Pass();
 }
 
 void MathUtil::AddToTracedValue(const gfx::Size& s,
diff --git a/cc/base/region.cc b/cc/base/region.cc
index 2484cc2..d752b20 100644
--- a/cc/base/region.cc
+++ b/cc/base/region.cc
@@ -127,7 +127,7 @@ scoped_ptr<base::Value> Region::AsValue() const {
     result->AppendInteger(rect.width());
     result->AppendInteger(rect.height());
   }
-  return result.PassAs<base::Value>();
+  return result.Pass();
 }
 
 void Region::AsValueInto(base::debug::TracedValue* result) const {
diff --git a/cc/base/scoped_ptr_vector.h b/cc/base/scoped_ptr_vector.h
index 7f86ce3..0b83e35 100644
--- a/cc/base/scoped_ptr_vector.h
+++ b/cc/base/scoped_ptr_vector.h
@@ -72,7 +72,7 @@ class ScopedPtrVector {
 
   scoped_ptr<T> take(iterator position) {
     if (position == end())
-      return scoped_ptr<T>();
+      return nullptr;
     DCHECK(position < end());
 
     typename std::vector<T*>::iterator writable_position = position;
@@ -84,7 +84,7 @@ class ScopedPtrVector {
   scoped_ptr<T> take_back() {
     DCHECK(!empty());
     if (empty())
-      return scoped_ptr<T>(NULL);
+      return nullptr;
     return take(end() - 1);
   }
 
-- 
cgit v1.1