diff options
Diffstat (limited to 'ui/gfx/image/image_unittest_util.cc')
| -rw-r--r-- | ui/gfx/image/image_unittest_util.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc index 3dd5b60..fc4b6cf 100644 --- a/ui/gfx/image/image_unittest_util.cc +++ b/ui/gfx/image/image_unittest_util.cc @@ -84,9 +84,20 @@ bool IsEmpty(const gfx::Image& image) { PlatformImage CreatePlatformImage() { const SkBitmap bitmap(CreateBitmap(25, 25)); #if defined(OS_IOS) + // iOS only supports one scale factor. + std::vector<ui::ScaleFactor> supported_scale_factors = + ui::GetSupportedScaleFactors(); + DCHECK_EQ(1U, supported_scale_factors.size()); + if (supported_scale_factors.size() < 1) + return nil; + + ui::ScaleFactor scale_factor = supported_scale_factors[0]; + float scale = ui::GetScaleFactorScale(scale_factor); + base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space( CGColorSpaceCreateDeviceRGB()); - UIImage* image = gfx::SkBitmapToUIImageWithColorSpace(bitmap, color_space); + UIImage* image = + gfx::SkBitmapToUIImageWithColorSpace(bitmap, scale, color_space); base::mac::NSObjectRetain(image); return image; #elif defined(OS_MACOSX) |