Remove dependency on ui::ScaleFactor from ui/gfx

content/browser/renderer_host/backing_store_aura.cc

 // 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 "content/browser/renderer_host/backing_store_aura.h"
 
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/render_widget_host.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 20 matching lines @@
 // with signed numbers. If the maximum value is 2**31, then 2**31 / 4 =
 // 2**29 and floor(sqrt(2**29)) = 23170.
 
 // Max height and width for layers
 static const int kMaxVideoLayerSize = 23170;
 
 BackingStoreAura::BackingStoreAura(RenderWidgetHost* widget,
                                    const gfx::Size& size)
     : BackingStore(widget, size) {
   device_scale_factor_ =
-      ui::GetScaleFactorScale(GetScaleFactorForView(widget->GetView()));
+      ui::GetImageScale(GetScaleFactorForView(widget->GetView()));
   gfx::Size pixel_size = ToPixelSize(size, device_scale_factor_);
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
       pixel_size.width(), pixel_size.height());
   bitmap_.allocPixels();
   canvas_.reset(new SkCanvas(bitmap_));
 }
 
 BackingStoreAura::~BackingStoreAura() {
 }
 
 void BackingStoreAura::SkiaShowRect(const gfx::Point& point,
                                     gfx::Canvas* canvas) {
   gfx::ImageSkia image = gfx::ImageSkia(gfx::ImageSkiaRep(bitmap_,
-      ui::GetScaleFactorFromScale(device_scale_factor_)));
+      device_scale_factor_));
   canvas->DrawImageInt(image, point.x(), point.y());
 }
 
 void BackingStoreAura::ScaleFactorChanged(float device_scale_factor) {
   if (device_scale_factor == device_scale_factor_)
     return;
 
   gfx::Size old_pixel_size = ToPixelSize(size(), device_scale_factor_);
   device_scale_factor_ = device_scale_factor;
 
@@ skipping 101 matching lines @@
 
   SkIRect skrect = SkIRect::MakeXYWH(rect.x(), rect.y(), width, height);
   SkBitmap b;
   if (!canvas_->readPixels(skrect, &b))
     return false;
   SkCanvas(output->GetBitmap()).writePixels(b, rect.x(), rect.y());
   return true;
 }
 
 }  // namespace content