Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Unified Diff: ui/gfx/icon_util.cc

Issue 126103003: Changed RefCountedStaticMemory() to accept a void pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/icon_util.cc
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 223618601e32bb6311c23dd45416e06c12d7210c..fee7c289a7acfac9d84da1fd0278f2056fcbfaf3 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -290,9 +290,7 @@ 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(png_bytes, png_size);
+ gfx::Image image = gfx::Image::CreateFrom1xPNGBytes(png_data, png_size);
return scoped_ptr<SkBitmap>(new SkBitmap(image.AsBitmap()));
}
« base/memory/ref_counted_memory.h ('K') | « ui/base/resource/resource_data_dll_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698