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

Side by Side Diff: ui/gfx/image/image_skia_util_ios.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
« no previous file with comments | « ui/base/cocoa/controls/blue_label_button.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ui/gfx/image/image_skia_util_ios.h" 5 #include "ui/gfx/image/image_skia_util_ios.h"
6 6
7 #include <UIKit/UIKit.h> 7 #include <UIKit/UIKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
(...skipping 13 matching lines...) Expand all
24 return image_skia; 24 return image_skia;
25 } 25 }
26 26
27 gfx::ImageSkiaRep ImageSkiaRepOfScaleFromUIImage(UIImage* image, float scale) { 27 gfx::ImageSkiaRep ImageSkiaRepOfScaleFromUIImage(UIImage* image, float scale) {
28 if (!image) 28 if (!image)
29 return gfx::ImageSkiaRep(); 29 return gfx::ImageSkiaRep();
30 30
31 CGSize size = image.size; 31 CGSize size = image.size;
32 CGSize desired_size_for_scale = 32 CGSize desired_size_for_scale =
33 CGSizeMake(size.width * scale, size.height * scale); 33 CGSizeMake(size.width * scale, size.height * scale);
34 SkBitmap bitmap(gfx::CGImageToSkBitmap(image.CGImage, 34 SkBitmap bitmap(skia::CGImageToSkBitmap(image.CGImage,
35 desired_size_for_scale, 35 desired_size_for_scale,
36 false)); 36 false));
37 return gfx::ImageSkiaRep(bitmap, scale); 37 return gfx::ImageSkiaRep(bitmap, scale);
38 } 38 }
39 39
40 UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia) { 40 UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia) {
41 return UIImageFromImageSkiaRep( 41 return UIImageFromImageSkiaRep(
42 image_skia.GetRepresentation(ImageSkia::GetSupportedScales().back())); 42 image_skia.GetRepresentation(ImageSkia::GetSupportedScales().back()));
43 } 43 }
44 44
45 UIImage* UIImageFromImageSkiaRep(const gfx::ImageSkiaRep& image_skia_rep) { 45 UIImage* UIImageFromImageSkiaRep(const gfx::ImageSkiaRep& image_skia_rep) {
46 if (image_skia_rep.is_null()) 46 if (image_skia_rep.is_null())
47 return nil; 47 return nil;
48 48
49 float scale = image_skia_rep.scale(); 49 float scale = image_skia_rep.scale();
50 base::ScopedCFTypeRef<CGColorSpaceRef> color_space( 50 base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
51 CGColorSpaceCreateDeviceRGB()); 51 CGColorSpaceCreateDeviceRGB());
52 return gfx::SkBitmapToUIImageWithColorSpace(image_skia_rep.sk_bitmap(), scale, 52 return skia::SkBitmapToUIImageWithColorSpace(image_skia_rep.sk_bitmap(),
53 color_space); 53 scale, color_space);
54 } 54 }
55 55
56 } // namespace gfx 56 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/base/cocoa/controls/blue_label_button.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698