OLD | NEW |
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.h" | 5 #include "ui/gfx/image/image.h" |
6 | 6 |
7 #import <UIKit/UIKit.h> | 7 #import <UIKit/UIKit.h> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <limits> | 9 #include <limits> |
10 | 10 |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/mac/scoped_cftyperef.h" | 12 #include "base/mac/scoped_cftyperef.h" |
13 #include "base/mac/scoped_nsobject.h" | 13 #include "base/mac/scoped_nsobject.h" |
| 14 #include "ui/gfx/geometry/size.h" |
14 #include "ui/gfx/image/image_png_rep.h" | 15 #include "ui/gfx/image/image_png_rep.h" |
15 #include "ui/gfx/image/image_skia.h" | 16 #include "ui/gfx/image/image_skia.h" |
16 #include "ui/gfx/image/image_skia_util_ios.h" | 17 #include "ui/gfx/image/image_skia_util_ios.h" |
17 #include "ui/gfx/size.h" | |
18 | 18 |
19 namespace gfx { | 19 namespace gfx { |
20 namespace internal { | 20 namespace internal { |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 // Returns a 16x16 red UIImage to visually show when a UIImage cannot be | 24 // Returns a 16x16 red UIImage to visually show when a UIImage cannot be |
25 // created from PNG data. Logs error as well. | 25 // created from PNG data. Logs error as well. |
26 // Caller takes ownership of returned UIImage. | 26 // Caller takes ownership of returned UIImage. |
27 UIImage* CreateErrorUIImage(float scale) { | 27 UIImage* CreateErrorUIImage(float scale) { |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 } | 125 } |
126 | 126 |
127 gfx::Size UIImageSize(UIImage* image) { | 127 gfx::Size UIImageSize(UIImage* image) { |
128 int width = static_cast<int>(image.size.width); | 128 int width = static_cast<int>(image.size.width); |
129 int height = static_cast<int>(image.size.height); | 129 int height = static_cast<int>(image.size.height); |
130 return gfx::Size(width, height); | 130 return gfx::Size(width, height); |
131 } | 131 } |
132 | 132 |
133 } // namespace internal | 133 } // namespace internal |
134 } // namespace gfx | 134 } // namespace gfx |
OLD | NEW |