summaryrefslogtreecommitdiffstats
path: root/ui/gfx/icon_util.cc
diff options
context:
space:
mode:
authorjoaoe@opera.com <joaoe@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 22:34:08 +0000
committerjoaoe@opera.com <joaoe@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 22:34:08 +0000
commit8df08cf1a988931e952fb85e811418bfe587d050 (patch)
treee03be7805a62ef18310febf4866408c47d1c8886 /ui/gfx/icon_util.cc
parent8ed420c98cc6dc1da9d46ca42e47b82843f9de4e (diff)
downloadchromium_src-8df08cf1a988931e952fb85e811418bfe587d050.zip
chromium_src-8df08cf1a988931e952fb85e811418bfe587d050.tar.gz
chromium_src-8df08cf1a988931e952fb85e811418bfe587d050.tar.bz2
Changed RefCountedStaticMemory() to accept a void pointer.
Using a void pointer saves lots of redundant casting. Also added RefCountedMemory front_as<type> which saves typing by not having to wrap each call with a reinterpret_cast<>. Review URL: https://codereview.chromium.org/126103003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/icon_util.cc')
-rw-r--r--ui/gfx/icon_util.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 521c041..5ddf137 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -290,10 +290,8 @@ scoped_ptr<SkBitmap> IconUtil::CreateSkBitmapFromIconResource(HMODULE module,
DCHECK(png_data);
DCHECK_EQ(png_size, large_icon_entry->dwBytesInRes);
- const unsigned char* png_bytes =
- reinterpret_cast<const unsigned char*>(png_data);
gfx::Image image = gfx::Image::CreateFrom1xPNGBytes(
- new base::RefCountedStaticMemory(png_bytes, png_size));
+ new base::RefCountedStaticMemory(png_data, png_size));
return scoped_ptr<SkBitmap>(new SkBitmap(image.AsBitmap()));
}