Use base::RefCountedBytes in user_manager::UserImage

chrome/browser/chromeos/login/users/avatar/user_image_loader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/users/avatar/user_image_loader.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
         loaded_cb(loaded_cb) {}
   ~ImageInfo() {}
 
   const base::FilePath file_path;
   const int pixels_per_side;
   const ImageDecoder::ImageCodec image_codec;
   const LoadedCallback loaded_cb;
 };
 
 // Crops |image| to the square format and downsizes the image to
-// |target_size| in pixels. On success, returns true and stores the cropped
-// image in |bitmap| and the bytes representation in |byytes|.
-bool CropImage(const SkBitmap& image,
-               int target_size,
-               SkBitmap* bitmap,
-               user_manager::UserImage::Bytes* bytes) {
+// |target_size| in pixels. On success, returns the bytes representation and
+// stores the cropped image in |bitmap|. On failure, returns nullptr.
+scoped_refptr<base::RefCountedBytes> CropImage(const SkBitmap& image,
+                                               int target_size,
+                                               SkBitmap* bitmap) {
   DCHECK_GT(target_size, 0);
 
   SkBitmap final_image;
   // Auto crop the image, taking the largest square in the center.
   int pixels_per_side = std::min(image.width(), image.height());
   int x = (image.width() - pixels_per_side) / 2;
   int y = (image.height() - pixels_per_side) / 2;
   SkBitmap cropped_image = SkBitmapOperations::CreateTiledBitmap(
       image, x, y, pixels_per_side, pixels_per_side);
   if (pixels_per_side > target_size) {
     // Also downsize the image to save space and memory.
     final_image = skia::ImageOperations::Resize(
         cropped_image, skia::ImageOperations::RESIZE_LANCZOS3, target_size,
         target_size);
   } else {
     final_image = cropped_image;
   }
 
   // Encode the cropped image to web-compatible bytes representation
-  std::unique_ptr<user_manager::UserImage::Bytes> encoded =
+  scoped_refptr<base::RefCountedBytes> encoded =
       user_manager::UserImage::Encode(final_image);
   if (!encoded)

[achuithb, 2016/11/22 21:16:54]

Does this early return still make sense?

Why not:
if (encoded)
  bitmap->swap(final_image);
return encoded;

[satorux1, 2016/11/24 02:13:40]

good idea. done!

-    return false;
+    return nullptr;
 
   bitmap->swap(final_image);
-  bytes->swap(*encoded);
-  return true;
+  return encoded;
 }
 
 // Handles the decoded image returned from ImageDecoder through the
 // ImageRequest interface.
 class UserImageRequest : public ImageDecoder::ImageRequest {
  public:
   UserImageRequest(
       const ImageInfo& image_info,
       const std::string& image_data,
       scoped_refptr<base::SequencedTaskRunner> background_task_runner)
       : image_info_(image_info),
-        image_data_(image_data.begin(), image_data.end()),
+        // TODO(crbug.com/593251): Remove the data copy here.
+        image_data_(new base::RefCountedBytes(
+            reinterpret_cast<const unsigned char*>(image_data.data()),
+            image_data.size())),
         background_task_runner_(background_task_runner),
         weak_ptr_factory_(this) {}
   ~UserImageRequest() override {}
 
   // ImageDecoder::ImageRequest implementation.
   void OnImageDecoded(const SkBitmap& decoded_image) override;
   void OnDecodeImageFailed() override;
 
   // Called after the image is cropped (and downsized) as needed.
   void OnImageCropped(SkBitmap* bitmap,
-                      user_manager::UserImage::Bytes* bytes,
-                      bool succeeded);
+                      scoped_refptr<base::RefCountedBytes> bytes);
 
   // Called after the image is finalized. |image_bytes_regenerated| is true
   // if |image_bytes| is regenerated from the cropped image.
   void OnImageFinalized(const SkBitmap& image,
-                        const user_manager::UserImage::Bytes& image_bytes,
+                        scoped_refptr<base::RefCountedBytes> image_bytes,
                         bool image_bytes_regenerated);
 
  private:
   const ImageInfo image_info_;
-  const user_manager::UserImage::Bytes image_data_;
+  scoped_refptr<base::RefCountedBytes> image_data_;
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
   // This should be the last member.
   base::WeakPtrFactory<UserImageRequest> weak_ptr_factory_;
 };
 
 void UserImageRequest::OnImageDecoded(const SkBitmap& decoded_image) {
   int target_size = image_info_.pixels_per_side;
   if (target_size > 0) {
     // Cropping an image could be expensive, hence posting to the background
     // thread.
     SkBitmap* bitmap = new SkBitmap;
-    user_manager::UserImage::Bytes* bytes = new user_manager::UserImage::Bytes;
     base::PostTaskAndReplyWithResult(
         background_task_runner_.get(), FROM_HERE,
-        base::Bind(&CropImage, decoded_image, target_size, bitmap, bytes),
+        base::Bind(&CropImage, decoded_image, target_size, bitmap),
         base::Bind(&UserImageRequest::OnImageCropped,
-                   weak_ptr_factory_.GetWeakPtr(), base::Owned(bitmap),
-                   base::Owned(bytes)));
+                   weak_ptr_factory_.GetWeakPtr(), base::Owned(bitmap)));
   } else {
     OnImageFinalized(decoded_image, image_data_,
                      false /* image_bytes_regenerated */);
   }
 }
 
-void UserImageRequest::OnImageCropped(SkBitmap* bitmap,
-                                      user_manager::UserImage::Bytes* bytes,
-                                      bool succeeded) {
+void UserImageRequest::OnImageCropped(
+    SkBitmap* bitmap,
+    scoped_refptr<base::RefCountedBytes> bytes) {
   DCHECK_GT(image_info_.pixels_per_side, 0);
 
-  if (!succeeded) {
+  if (!bytes) {
     OnDecodeImageFailed();
     return;
   }
-  OnImageFinalized(*bitmap, *bytes, true /* image_bytes_regenerated */);
+  OnImageFinalized(*bitmap, bytes, true /* image_bytes_regenerated */);
 }
 
 void UserImageRequest::OnImageFinalized(
     const SkBitmap& image,
-    const user_manager::UserImage::Bytes& image_bytes,
+    scoped_refptr<base::RefCountedBytes> image_bytes,
     bool image_bytes_regenerated) {
   SkBitmap final_image = image;
   // Make the SkBitmap immutable as we won't modify it. This is important
   // because otherwise it gets duplicated during painting, wasting memory.
   final_image.setImmutable();
   gfx::ImageSkia final_image_skia =
       gfx::ImageSkia::CreateFrom1xBitmap(final_image);
   final_image_skia.MakeThreadSafe();
   std::unique_ptr<user_manager::UserImage> user_image(
       new user_manager::UserImage(final_image_skia, image_bytes));
@@ skipping 54 matching lines @@
     ImageDecoder::ImageCodec image_codec,
     int pixels_per_side,
     const LoadedCallback& loaded_cb) {
   DecodeImage(
       ImageInfo(base::FilePath(), pixels_per_side, image_codec, loaded_cb),
       background_task_runner, data.get(), true /* data_is_ready */);
 }
 
 }  // namespace user_image_loader
 }  // namespace chromeos