| 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 #include <stddef.h> |
| 7 #import <UIKit/UIKit.h> | 8 #import <UIKit/UIKit.h> |
| 8 #include <cmath> | 9 #include <cmath> |
| 9 #include <limits> | 10 #include <limits> |
| 10 | 11 |
| 11 #include "base/logging.h" | 12 #include "base/logging.h" |
| 12 #include "base/mac/scoped_cftyperef.h" | 13 #include "base/mac/scoped_cftyperef.h" |
| 13 #include "base/mac/scoped_nsobject.h" | 14 #include "base/mac/scoped_nsobject.h" |
| 14 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
| 15 #include "ui/gfx/image/image_png_rep.h" | 16 #include "ui/gfx/image/image_png_rep.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 17 #include "ui/gfx/image/image_skia.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 } | 126 } |
| 126 | 127 |
| 127 gfx::Size UIImageSize(UIImage* image) { | 128 gfx::Size UIImageSize(UIImage* image) { |
| 128 int width = static_cast<int>(image.size.width); | 129 int width = static_cast<int>(image.size.width); |
| 129 int height = static_cast<int>(image.size.height); | 130 int height = static_cast<int>(image.size.height); |
| 130 return gfx::Size(width, height); | 131 return gfx::Size(width, height); |
| 131 } | 132 } |
| 132 | 133 |
| 133 } // namespace internal | 134 } // namespace internal |
| 134 } // namespace gfx | 135 } // namespace gfx |
| OLD | NEW |