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

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

Issue 10830111: [cros] Encode user images when set from WebUI (regression fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes 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
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 } // namespace 24 } // namespace
25 25
26 // static
27 UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
28 RawImage raw_image;
29 return gfx::PNGCodec::EncodeBGRASkBitmap(image, false, &raw_image) ?
30 UserImage(image, raw_image) : UserImage(image);
31 }
32
26 UserImage::UserImage() 33 UserImage::UserImage()
27 : has_raw_image_(false), 34 : has_raw_image_(false),
28 has_animated_image_(false) { 35 has_animated_image_(false) {
29 } 36 }
30 37
31 UserImage::UserImage(const gfx::ImageSkia& image) 38 UserImage::UserImage(const gfx::ImageSkia& image)
32 : image_(image), 39 : image_(image),
33 has_raw_image_(false), 40 has_raw_image_(false),
34 has_animated_image_(false) { 41 has_animated_image_(false) {
35 } 42 }
36 43
37 UserImage::UserImage(const gfx::ImageSkia& image, 44 UserImage::UserImage(const gfx::ImageSkia& image,
38 const RawImage& raw_image) 45 const RawImage& raw_image)
39 : image_(image), 46 : image_(image),
40 has_raw_image_(false), 47 has_raw_image_(false),
41 has_animated_image_(false) { 48 has_animated_image_(false) {
42 if (IsAnimatedImage(raw_image)) { 49 if (IsAnimatedImage(raw_image)) {
43 has_animated_image_ = true; 50 has_animated_image_ = true;
44 animated_image_ = raw_image; 51 animated_image_ = raw_image;
45 if (gfx::PNGCodec::EncodeBGRASkBitmap(image_, false, &raw_image_)) 52 if (gfx::PNGCodec::EncodeBGRASkBitmap(image_, false, &raw_image_))
46 has_raw_image_ = true; 53 has_raw_image_ = true;
47 } else { 54 } else {
48 has_raw_image_ = true; 55 has_raw_image_ = true;
49 raw_image_ = raw_image; 56 raw_image_ = raw_image;
50 } 57 }
51 } 58 }
52 59
53 UserImage::~UserImage() {} 60 UserImage::~UserImage() {}
54 61
62 void UserImage::DiscardRawImage() {
63 RawImage().swap(raw_image_); // Clear |raw_image_|.
64 }
65
55 } // namespace chromeos 66 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698