diff options
| author | tfarina <tfarina@chromium.org> | 2014-11-21 07:36:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-21 15:37:13 +0000 |
| commit | fe7161a65996b9f186bb347a70c92f919d990e28 (patch) | |
| tree | 55c2b6b85071453ca97c1be2bb550f6c4aaa1dad | |
| parent | 54b31c95b28615e79d73746819852c86d00e312d (diff) | |
| download | chromium_src-fe7161a65996b9f186bb347a70c92f919d990e28.zip chromium_src-fe7161a65996b9f186bb347a70c92f919d990e28.tar.gz chromium_src-fe7161a65996b9f186bb347a70c92f919d990e28.tar.bz2 | |
ui/gfx: Return nullptr when possible.
These entries were found running the following command line:
$ g grep -E '\bscoped_ptr<.*?>\(\)' ui/gfx
BUG=None
TEST=ninja -C out/Debug gfx_unittests && out/Debug/gfx_unittests
R=danakj@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/746033002
Cr-Commit-Position: refs/heads/master@{#305221}
| -rw-r--r-- | ui/gfx/font_render_params_linux_unittest.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/geometry/r_tree_base.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/icon_util.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc index c752cc3..46a4fcf 100644 --- a/ui/gfx/font_render_params_linux_unittest.cc +++ b/ui/gfx/font_render_params_linux_unittest.cc @@ -33,7 +33,7 @@ class TestFontDelegate : public LinuxFontDelegate { scoped_ptr<ScopedPangoFontDescription> GetDefaultPangoFontDescription() const override { NOTIMPLEMENTED(); - return scoped_ptr<ScopedPangoFontDescription>(); + return nullptr; } double GetFontDPI() const override { NOTIMPLEMENTED(); diff --git a/ui/gfx/geometry/r_tree_base.cc b/ui/gfx/geometry/r_tree_base.cc index fd5deab..1ddb356 100644 --- a/ui/gfx/geometry/r_tree_base.cc +++ b/ui/gfx/geometry/r_tree_base.cc @@ -64,7 +64,7 @@ void RTreeBase::RecordBase::AppendAllRecords(Records* matches_out) const { scoped_ptr<RTreeBase::NodeBase> RTreeBase::RecordBase::RemoveAndReturnLastChild() { - return scoped_ptr<NodeBase>(); + return nullptr; } int RTreeBase::RecordBase::Level() const { @@ -146,7 +146,7 @@ scoped_ptr<RTreeBase::NodeBase> RTreeBase::Node::RemoveChild( scoped_ptr<RTreeBase::NodeBase> RTreeBase::Node::RemoveAndReturnLastChild() { if (children_.empty()) - return scoped_ptr<NodeBase>(); + return nullptr; scoped_ptr<NodeBase> last_child(children_.back()); children_.weak_erase(children_.end() - 1); diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index 45d688b..8eb45ae 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -266,7 +266,7 @@ scoped_ptr<SkBitmap> IconUtil::CreateSkBitmapFromIconResource(HMODULE module, size_t icon_dir_size = 0; if (!base::win::GetResourceFromModule(module, resource_id, RT_GROUP_ICON, &icon_dir_data, &icon_dir_size)) { - return scoped_ptr<SkBitmap>(); + return nullptr; } DCHECK(icon_dir_data); DCHECK_GE(icon_dir_size, sizeof(GRPICONDIR)); @@ -284,13 +284,13 @@ scoped_ptr<SkBitmap> IconUtil::CreateSkBitmapFromIconResource(HMODULE module, } } if (!large_icon_entry) - return scoped_ptr<SkBitmap>(); + return nullptr; void* png_data = NULL; size_t png_size = 0; if (!base::win::GetResourceFromModule(module, large_icon_entry->nID, RT_ICON, &png_data, &png_size)) { - return scoped_ptr<SkBitmap>(); + return nullptr; } DCHECK(png_data); DCHECK_EQ(png_size, large_icon_entry->dwBytesInRes); |