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

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: rebase Created 6 years, 10 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
« no previous file with comments | « ui/base/resource/resource_data_dll_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/icon_util.cc
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 521c0410937671a4befa07315814e20b799c46a0..5ddf137e8ca9244cf0cc1f78e88c1da6d3491523 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()));
}
« no previous file with comments | « 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