| 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/base/layout.h" | |
| 15 #include "ui/gfx/image/image_png_rep.h" | 14 #include "ui/gfx/image/image_png_rep.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 15 #include "ui/gfx/image/image_skia.h" |
| 17 #include "ui/gfx/image/image_skia_util_ios.h" | 16 #include "ui/gfx/image/image_skia_util_ios.h" |
| 18 #include "ui/gfx/size.h" | 17 #include "ui/gfx/size.h" |
| 19 | 18 |
| 20 namespace gfx { | 19 namespace gfx { |
| 21 namespace internal { | 20 namespace internal { |
| 22 | 21 |
| 23 namespace { | 22 namespace { |
| 24 | 23 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 } | 125 } |
| 127 | 126 |
| 128 gfx::Size UIImageSize(UIImage* image) { | 127 gfx::Size UIImageSize(UIImage* image) { |
| 129 int width = static_cast<int>(image.size.width); | 128 int width = static_cast<int>(image.size.width); |
| 130 int height = static_cast<int>(image.size.height); | 129 int height = static_cast<int>(image.size.height); |
| 131 return gfx::Size(width, height); | 130 return gfx::Size(width, height); |
| 132 } | 131 } |
| 133 | 132 |
| 134 } // namespace internal | 133 } // namespace internal |
| 135 } // namespace gfx | 134 } // namespace gfx |
| OLD | NEW |