diff options
| author | tfarina <tfarina@chromium.org> | 2014-11-24 10:36:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-24 18:37:37 +0000 |
| commit | e6689e8c5ce18ea29f499d2546ec6d93260778a0 (patch) | |
| tree | 4ce4ece048c6403da5406146c8235603c6c034f6 | |
| parent | d8a2e8081db3ed1a4d7f06357d9bf8c0fc28c456 (diff) | |
| download | chromium_src-e6689e8c5ce18ea29f499d2546ec6d93260778a0.zip chromium_src-e6689e8c5ce18ea29f499d2546ec6d93260778a0.tar.gz chromium_src-e6689e8c5ce18ea29f499d2546ec6d93260778a0.tar.bz2 | |
ui/gfx: Return make_scoped_ptr when/where possible.
The entries where found with the following command line:
$ git grep 'return scoped_ptr<' ui/gfx
BUG=None
TEST=ninja -C out/Debug gfx_unittests && out/Debug/gfx_unittests
R=sky@chromium.org
Review URL: https://codereview.chromium.org/755543002
Cr-Commit-Position: refs/heads/master@{#305450}
| -rw-r--r-- | ui/gfx/geometry/r_tree_base.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/icon_util.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/image/image_skia.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/gfx/geometry/r_tree_base.cc b/ui/gfx/geometry/r_tree_base.cc index 1ddb356..3848243 100644 --- a/ui/gfx/geometry/r_tree_base.cc +++ b/ui/gfx/geometry/r_tree_base.cc @@ -141,7 +141,7 @@ scoped_ptr<RTreeBase::NodeBase> RTreeBase::Node::RemoveChild( DCHECK(i != children_.end()); children_.weak_erase(i); - return scoped_ptr<NodeBase>(child_node); + return make_scoped_ptr(child_node); } scoped_ptr<RTreeBase::NodeBase> RTreeBase::Node::RemoveAndReturnLastChild() { diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index 8eb45ae..6168f21 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -297,7 +297,7 @@ scoped_ptr<SkBitmap> IconUtil::CreateSkBitmapFromIconResource(HMODULE module, gfx::Image image = gfx::Image::CreateFrom1xPNGBytes( new base::RefCountedStaticMemory(png_data, png_size)); - return scoped_ptr<SkBitmap>(new SkBitmap(image.AsBitmap())); + return make_scoped_ptr(new SkBitmap(image.AsBitmap())); } SkBitmap* IconUtil::CreateSkBitmapFromHICON(HICON icon) { diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc index b6d9d8d..2a8bae2 100644 --- a/ui/gfx/image/image_skia.cc +++ b/ui/gfx/image/image_skia.cc @@ -320,7 +320,7 @@ ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) { scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const { ImageSkia* copy = new ImageSkia; if (isNull()) - return scoped_ptr<ImageSkia>(copy); + return make_scoped_ptr(copy); CHECK(CanRead()); @@ -333,7 +333,7 @@ scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const { // thread so that other thread can use this. if (!copy->isNull()) copy->storage_->DetachFromThread(); - return scoped_ptr<ImageSkia>(copy); + return make_scoped_ptr(copy); } bool ImageSkia::BackedBySameObjectAs(const gfx::ImageSkia& other) const { |