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

Side by Side Diff: chrome/browser/chromeos/login/user_image.cc

Issue 10857060: Fixes UserImage::CreateAndEncode (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/user_image.h" 5 #include "chrome/browser/chromeos/login/user_image.h"
6 6
7 #include "ui/gfx/codec/png_codec.h" 7 #include "ui/gfx/codec/png_codec.h"
8 8
9 namespace chromeos { 9 namespace chromeos {
10 10
11 namespace { 11 namespace {
12 12
13 bool IsAnimatedImage(const UserImage::RawImage& data) { 13 bool IsAnimatedImage(const UserImage::RawImage& data) {
14 const char kGIFStamp[] = "GIF"; 14 const char kGIFStamp[] = "GIF";
15 const size_t kGIFStampLength = sizeof(kGIFStamp) - 1; 15 const size_t kGIFStampLength = sizeof(kGIFStamp) - 1;
16 16
17 if (data.size() >= kGIFStampLength && 17 if (data.size() >= kGIFStampLength &&
18 memcmp(&data[0], kGIFStamp, kGIFStampLength) == 0) { 18 memcmp(&data[0], kGIFStamp, kGIFStampLength) == 0) {
19 return true; 19 return true;
20 } 20 }
21 return false; 21 return false;
22 } 22 }
23 23
24 bool EncodeBGRAImageSkia(const gfx::ImageSkia& image, 24 bool EncodeBGRAImageSkia(const gfx::ImageSkia& image,
25 bool discard_transparency, 25 bool discard_transparency,
26 std::vector<unsigned char>* output) { 26 std::vector<unsigned char>* output) {
27 if (image.empty() || image.bitmap()) 27 if (image.empty() || !image.bitmap())
28 return false; 28 return false;
29 return gfx::PNGCodec::EncodeBGRASkBitmap(*image.bitmap(), 29 return gfx::PNGCodec::EncodeBGRASkBitmap(*image.bitmap(),
30 discard_transparency, output); 30 discard_transparency, output);
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 // static 35 // static
36 UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) { 36 UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
37 RawImage raw_image; 37 RawImage raw_image;
(...skipping 28 matching lines...) Expand all
66 } 66 }
67 } 67 }
68 68
69 UserImage::~UserImage() {} 69 UserImage::~UserImage() {}
70 70
71 void UserImage::DiscardRawImage() { 71 void UserImage::DiscardRawImage() {
72 RawImage().swap(raw_image_); // Clear |raw_image_|. 72 RawImage().swap(raw_image_); // Clear |raw_image_|.
73 } 73 }
74 74
75 } // namespace chromeos 75 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698