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

trunk/src/ui/gfx/canvas_paint_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/canvas_paint_mac.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 
 CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect)
@@ skipping 40 matching lines @@
 }
 
 void CanvasSkiaPaint::Init(bool opaque) {
   CGContextRef destination_context =
         (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
   CGRect scaled_unit_rect = CGContextConvertRectToDeviceSpace(
         destination_context, CGRectMake(0, 0, 1, 1));
     // Assume that the x scale and the y scale are the same.
   CGFloat scale = scaled_unit_rect.size.width;
 
+  ui::ScaleFactor scale_factor = ui::GetScaleFactorFromScale(scale);
   gfx::Size size(NSWidth(rectangle_), NSHeight(rectangle_));
-  RecreateBackingCanvas(size, scale, opaque);
+  RecreateBackingCanvas(size, scale_factor, opaque);
   skia::PlatformCanvas* canvas = platform_canvas();
   canvas->clear(SkColorSetARGB(0, 0, 0, 0));
 
     // Need to translate so that the dirty region appears at the origin of the
     // surface.
   canvas->translate(-SkDoubleToScalar(NSMinX(rectangle_)),
                     -SkDoubleToScalar(NSMinY(rectangle_)));
 
   context_ = skia::GetBitmapContext(skia::GetTopDevice(*canvas));
 }
 
 }  // namespace skia
 
-
+