| Index: components/user_manager/user_image/user_image.cc
|
| diff --git a/components/user_manager/user_image/user_image.cc b/components/user_manager/user_image/user_image.cc
|
| index e9937dab81a81fe636788dbd73658760fd7d992f..a13e23841de019724181538333134bc17194425f 100644
|
| --- a/components/user_manager/user_image/user_image.cc
|
| +++ b/components/user_manager/user_image/user_image.cc
|
| @@ -16,7 +16,7 @@ namespace {
|
| const int kDefaultEncodingQuality = 90;
|
|
|
| bool EncodeImageSkia(const gfx::ImageSkia& image,
|
| - std::vector<unsigned char>* output) {
|
| + UserImage::WebImage* output) {
|
| TRACE_EVENT2("oobe", "EncodeImageSkia",
|
| "width", image.width(), "height", image.height());
|
| if (image.isNull())
|
| @@ -36,9 +36,9 @@ bool EncodeImageSkia(const gfx::ImageSkia& image,
|
|
|
| // static
|
| UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
|
| - RawImage raw_image;
|
| - if (EncodeImageSkia(image, &raw_image)) {
|
| - UserImage result(image, raw_image);
|
| + WebImage web_image;
|
| + if (EncodeImageSkia(image, &web_image)) {
|
| + UserImage result(image, web_image);
|
| result.MarkAsSafe();
|
| return result;
|
| }
|
| @@ -46,29 +46,29 @@ UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
|
| }
|
|
|
| UserImage::UserImage()
|
| - : has_raw_image_(false),
|
| + : has_web_image_(false),
|
| is_safe_format_(false) {
|
| }
|
|
|
| UserImage::UserImage(const gfx::ImageSkia& image)
|
| : image_(image),
|
| - has_raw_image_(false),
|
| + has_web_image_(false),
|
| is_safe_format_(false) {
|
| }
|
|
|
| UserImage::UserImage(const gfx::ImageSkia& image,
|
| - const RawImage& raw_image)
|
| + const WebImage& web_image)
|
| : image_(image),
|
| - has_raw_image_(false),
|
| + has_web_image_(false),
|
| is_safe_format_(false) {
|
| - has_raw_image_ = true;
|
| - raw_image_ = raw_image;
|
| + has_web_image_ = true;
|
| + web_image_ = web_image;
|
| }
|
|
|
| UserImage::~UserImage() {}
|
|
|
| -void UserImage::DiscardRawImage() {
|
| - RawImage().swap(raw_image_); // Clear |raw_image_|.
|
| +void UserImage::DiscardWebImage() {
|
| + WebImage().swap(web_image_); // Clear |web_image_|.
|
| }
|
|
|
| void UserImage::MarkAsSafe() {
|
|
|