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

Unified Diff: chrome/browser/chromeos/login/user_image.cc

Issue 10827371: status tray: Use explicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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: chrome/browser/chromeos/login/user_image.cc
diff --git a/chrome/browser/chromeos/login/user_image.cc b/chrome/browser/chromeos/login/user_image.cc
index fd00c1ecf4e39451d558e72c5b87a32e7b17970a..00a8ce0b53fbbfab9aca9f3fa43b48b82f396ef6 100644
--- a/chrome/browser/chromeos/login/user_image.cc
+++ b/chrome/browser/chromeos/login/user_image.cc
@@ -21,12 +21,21 @@ bool IsAnimatedImage(const UserImage::RawImage& data) {
return false;
}
+bool EncodeBGRAImageSkia(const gfx::ImageSkia& image,
+ bool discard_transparency,
+ std::vector<unsigned char>* output) {
+ if (image.empty() || image.bitmap())
+ return false;
+ return gfx::PNGCodec::EncodeBGRASkBitmap(*image.bitmap(),
+ discard_transparency, output);
+}
+
} // namespace
// static
UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
RawImage raw_image;
- return gfx::PNGCodec::EncodeBGRASkBitmap(image, false, &raw_image) ?
+ return EncodeBGRAImageSkia(image, false, &raw_image) ?
UserImage(image, raw_image) : UserImage(image);
}
@@ -49,7 +58,7 @@ UserImage::UserImage(const gfx::ImageSkia& image,
if (IsAnimatedImage(raw_image)) {
has_animated_image_ = true;
animated_image_ = raw_image;
- if (gfx::PNGCodec::EncodeBGRASkBitmap(image_, false, &raw_image_))
+ if (EncodeBGRAImageSkia(image_, false, &raw_image_))
has_raw_image_ = true;
} else {
has_raw_image_ = true;
« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | chrome/browser/media/media_stream_capture_indicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698