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

Side by Side Diff: components/suggestions/image_encoder_ios.mm

Issue 2257793002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/suggestions/image_encoder.h" 5 #include "components/suggestions/image_encoder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "skia/ext/skia_utils_ios.h" 12 #include "skia/ext/skia_utils_ios.h"
13 13
14 namespace suggestions { 14 namespace suggestions {
15 15
16 std::unique_ptr<SkBitmap> DecodeJPEGToSkBitmap(const void* encoded_data, 16 std::unique_ptr<SkBitmap> DecodeJPEGToSkBitmap(const void* encoded_data,
17 size_t size) { 17 size_t size) {
18 NSData* data = [NSData dataWithBytes:encoded_data length:size]; 18 NSData* data = [NSData dataWithBytes:encoded_data length:size];
19 UIImage* image = [UIImage imageWithData:data scale:1.0]; 19 UIImage* image = [UIImage imageWithData:data scale:1.0];
20 return base::WrapUnique( 20 return base::MakeUnique<SkBitmap>(
21 new SkBitmap(skia::CGImageToSkBitmap(image.CGImage, [image size], YES))); 21 skia::CGImageToSkBitmap(image.CGImage, [image size], YES));
22 } 22 }
23 23
24 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap, 24 bool EncodeSkBitmapToJPEG(const SkBitmap& bitmap,
25 std::vector<unsigned char>* dest) { 25 std::vector<unsigned char>* dest) {
26 base::ScopedCFTypeRef<CGColorSpaceRef> color_space( 26 base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
27 CGColorSpaceCreateDeviceRGB()); 27 CGColorSpaceCreateDeviceRGB());
28 UIImage* image = 28 UIImage* image =
29 skia::SkBitmapToUIImageWithColorSpace(bitmap, 1 /* scale */, color_space); 29 skia::SkBitmapToUIImageWithColorSpace(bitmap, 1 /* scale */, color_space);
30 NSData* data = UIImageJPEGRepresentation(image, 1.0); 30 NSData* data = UIImageJPEGRepresentation(image, 1.0);
31 const char* bytes = reinterpret_cast<const char*>([data bytes]); 31 const char* bytes = reinterpret_cast<const char*>([data bytes]);
32 dest->assign(bytes, bytes + [data length]); 32 dest->assign(bytes, bytes + [data length]);
33 return true; 33 return true;
34 } 34 }
35 35
36 } // namespace suggestions 36 } // namespace suggestions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698