| 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 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ | 5 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ |
| 6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ | 6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ |
| 7 | 7 |
| 8 #include "ui/base/layout.h" | 8 #include "ui/base/layout.h" |
| 9 #include "ui/base/ui_export.h" | 9 #include "ui/gfx/gfx_export.h" |
| 10 | 10 |
| 11 #ifdef __OBJC__ | 11 #ifdef __OBJC__ |
| 12 @class UIImage; | 12 @class UIImage; |
| 13 #else | 13 #else |
| 14 class UIImage; | 14 class UIImage; |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 namespace gfx { | 17 namespace gfx { |
| 18 class ImageSkia; | 18 class ImageSkia; |
| 19 class ImageSkiaRep; | 19 class ImageSkiaRep; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 35 // scale factor (eg Retina iPad -> 2x). Returns an autoreleased UIImage. | 35 // scale factor (eg Retina iPad -> 2x). Returns an autoreleased UIImage. |
| 36 UI_EXPORT UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia); | 36 UI_EXPORT UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia); |
| 37 | 37 |
| 38 // Converts to UIImage from ImageSkiaRep. Returns an autoreleased UIImage. | 38 // Converts to UIImage from ImageSkiaRep. Returns an autoreleased UIImage. |
| 39 UI_EXPORT UIImage* UIImageFromImageSkiaRep( | 39 UI_EXPORT UIImage* UIImageFromImageSkiaRep( |
| 40 const gfx::ImageSkiaRep& image_skia_rep); | 40 const gfx::ImageSkiaRep& image_skia_rep); |
| 41 | 41 |
| 42 } // namespace gfx | 42 } // namespace gfx |
| 43 | 43 |
| 44 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ | 44 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_ |
| OLD | NEW |