Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/ui/gfx/image/image_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/image/image.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 47 matching lines @@
   base::scoped_nsobject<NSImage> image;
   for (size_t i = 0; i < image_png_reps.size(); ++i) {
     scoped_refptr<base::RefCountedMemory> png = image_png_reps[i].raw_data;
     CHECK(png.get());
     base::scoped_nsobject<NSData> ns_data(
         [[NSData alloc] initWithBytes:png->front() length:png->size()]);
     base::scoped_nsobject<NSBitmapImageRep> ns_image_rep(
         [[NSBitmapImageRep alloc] initWithData:ns_data]);
     if (!ns_image_rep) {
       LOG(ERROR) << "Unable to decode PNG at "
-                 << image_png_reps[i].scale
+                 << ui::GetScaleFactorScale(image_png_reps[i].scale_factor)
                  << ".";
       return GetErrorNSImage();
     }
 
     // PNGCodec ignores colorspace related ancillary chunks (sRGB, iCCP). Ignore
     // colorspace information when decoding directly from PNG to an NSImage so
     // that the conversions: PNG -> SkBitmap -> NSImage and PNG -> NSImage
     // produce visually similar results.
     CGColorSpaceModel decoded_color_space_model = CGColorSpaceGetModel(
         [[ns_image_rep colorSpace] CGColorSpace]);
     CGColorSpaceModel color_space_model = CGColorSpaceGetModel(color_space);
     if (decoded_color_space_model == color_space_model) {
       base::scoped_nsobject<NSColorSpace> ns_color_space(
           [[NSColorSpace alloc] initWithCGColorSpace:color_space]);
       NSBitmapImageRep* ns_retagged_image_rep =
           [ns_image_rep
               bitmapImageRepByRetaggingWithColorSpace:ns_color_space];
       if (ns_retagged_image_rep && ns_retagged_image_rep != ns_image_rep)
         ns_image_rep.reset([ns_retagged_image_rep retain]);
     }
 
     if (!image.get()) {
-      float scale = image_png_reps[i].scale;
+      float scale = ui::GetScaleFactorScale(image_png_reps[i].scale_factor);
       NSSize image_size = NSMakeSize([ns_image_rep pixelsWide] / scale,
                                      [ns_image_rep pixelsHigh] / scale);
       image.reset([[NSImage alloc] initWithSize:image_size]);
     }
     [image addRepresentation:ns_image_rep];
   }
 
   return image.release();
 }
 
 gfx::Size NSImageSize(NSImage* image) {
   NSSize size = [image size];
   int width = static_cast<int>(size.width);
   int height = static_cast<int>(size.height);
   return gfx::Size(width, height);
 }
 
 } // namespace internal
 } // namespace gfx