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

trunk/src/ui/gfx/skia_util.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 "ui/gfx/skia_util.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
@@ skipping 50 matching lines @@
   flattened->set(8, SkDoubleToScalar(transform.matrix().getDouble(3, 3)));
 }
 
 skia::RefPtr<SkShader> CreateImageRepShader(const gfx::ImageSkiaRep& image_rep,
                                             SkShader::TileMode tile_mode,
                                             const SkMatrix& local_matrix) {
   skia::RefPtr<SkShader> shader = skia::AdoptRef(SkShader::CreateBitmapShader(
       image_rep.sk_bitmap(), tile_mode, tile_mode));
   SkScalar scale_x = local_matrix.getScaleX();
   SkScalar scale_y = local_matrix.getScaleY();
-  SkScalar bitmap_scale = SkFloatToScalar(image_rep.scale());
+  SkScalar bitmap_scale = SkFloatToScalar(image_rep.GetScale());
 
   // Unscale matrix by |bitmap_scale| such that the bitmap is drawn at the
   // correct density.
   // Convert skew and translation to pixel coordinates.
   // Thus, for |bitmap_scale| = 2:
   //   x scale = 2, x translation = 1 DIP,
   // should be converted to
   //   x scale = 1, x translation = 2 pixels.
   SkMatrix shader_scale = local_matrix;
   shader_scale.preScale(bitmap_scale, bitmap_scale);
@@ skipping 93 matching lines @@
     } else {
       rgba[i + 0] = SkGetPackedR32(pixel_in);
       rgba[i + 1] = SkGetPackedG32(pixel_in);
       rgba[i + 2] = SkGetPackedB32(pixel_in);
       rgba[i + 3] = alpha;
     }
   }
 }
 
 }  // namespace gfx