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

Unified Diff: chrome/browser/gears_integration.cc

Issue 18347: Add a PNGEncoder helper function that takes an SkBitmap, (Closed)
Patch Set: Test2 Created 11 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
« no previous file with comments | « chrome/browser/fav_icon_helper.cc ('k') | chrome/browser/importer/importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gears_integration.cc
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
old mode 100644
new mode 100755
index 580acba68b613b084b25a7ec5da1c06836c9db0a..0801cd6ea7870923945d1ccad39f1b2cdbe5329f
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -117,13 +117,7 @@ static GURL ConvertSkBitmapToDataURL(const SkBitmap& icon) {
// Get the FavIcon data.
std::vector<unsigned char> icon_data;
- {
- SkAutoLockPixels icon_lock(icon);
- PNGEncoder::Encode(static_cast<unsigned char*>(icon.getPixels()),
- PNGEncoder::FORMAT_BGRA, icon.width(),
- icon.height(), icon.width()* 4, false,
- &icon_data);
- }
+ PNGEncoder::EncodeBGRASkBitmap(icon, false, &icon_data);
// Base64-encode it (to make it a data URL).
std::string icon_data_str(reinterpret_cast<char*>(&icon_data[0]),
« no previous file with comments | « chrome/browser/fav_icon_helper.cc ('k') | chrome/browser/importer/importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698