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

trunk/src/ui/gfx/canvas.h

 // 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.
 
 #ifndef UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 72 matching lines @@
     // Similar to FORCE_RTL_DIRECTIONALITY, but left-to-right.
     // See FORCE_RTL_DIRECTIONALITY for details.
     FORCE_LTR_DIRECTIONALITY = 1 << 9,
 
     // Instructs DrawStringInt() to not use subpixel rendering.  This is useful
     // when rendering text onto a fully- or partially-transparent background
     // that will later be blended with another image.
     NO_SUBPIXEL_RENDERING = 1 << 10,
   };
 
-  // Creates an empty canvas with image_scale of 1x.
+  // Creates an empty canvas with scale factor of 1x.
   Canvas();
 
-  // Creates canvas with provided DIP |size| and |image_scale|.
+  // Creates canvas with provided DIP |size| and |scale_factor|.
   // If this canvas is not opaque, it's explicitly cleared to transparent before
   // being returned.
-  Canvas(const Size& size, float image_scale, bool is_opaque);
+  Canvas(const Size& size, ui::ScaleFactor scale_factor, bool is_opaque);
 
-  // Constructs a canvas with the size and the image_scale of the provided
-  // |image_rep|, and draws the |image_rep| into it.
+  // Constructs a canvas with the size and the scale factor of the
+  // provided |image_rep|, and draws the |image_rep| into it.
   Canvas(const ImageSkiaRep& image_rep, bool is_opaque);
 
   virtual ~Canvas();
 
-  // Creates a Canvas backed by an |sk_canvas| with |image_scale_|.
-  // |sk_canvas| is assumed to be already scaled based on |image_scale|
+  // Creates a Canvas backed by an |sk_canvas| with |scale_factor|.
+  // |sk_canvas| is assumed to be already scaled based on |scale_factor|
   // so no additional scaling is applied.
   static Canvas* CreateCanvasWithoutScaling(SkCanvas* sk_canvas,
-                                            float image_scale);
+                                            ui::ScaleFactor scale_factor);
 
-  // Recreates the backing platform canvas with DIP |size| and |image_scale_|.
+  // Recreates the backing platform canvas with DIP |size| and |scale_factor|.
   // If the canvas is not opaque, it is explicitly cleared.
   // This method is public so that canvas_skia_paint can recreate the platform
   // canvas after having initialized the canvas.
-  // TODO(pkotwicz): Push the image_scale into skia::PlatformCanvas such that
+  // TODO(pkotwicz): Push the scale factor into skia::PlatformCanvas such that
   // this method can be private.
   void RecreateBackingCanvas(const Size& size,
-                             float image_scale,
+                             ui::ScaleFactor scale_factor,
                              bool is_opaque);
 
   // Compute the size required to draw some text with the provided fonts.
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
   // supports multiple lines. On Skia only a line_height can be specified and
   // specifying a 0 value for it will cause the default height to be used.
   static void SizeStringInt(const base::string16& text,
                             const FontList& font_list,
                             int* width,
@@ skipping 313 matching lines @@
   void DrawFadeTruncatingString(
       const base::string16& text,
       TruncateFadeMode truncate_mode,
       size_t desired_characters_to_truncate_from_head,
       const Font& font,
       SkColor color,
       const Rect& display_rect);
 
   skia::PlatformCanvas* platform_canvas() const { return owned_canvas_.get(); }
   SkCanvas* sk_canvas() const { return canvas_; }
-  float image_scale() const { return image_scale_; }
+  ui::ScaleFactor scale_factor() const { return scale_factor_; }
 
  private:
-  Canvas(SkCanvas* canvas, float image_scale);
+  Canvas(SkCanvas* canvas, ui::ScaleFactor scale_factor);
 
   // Test whether the provided rectangle intersects the current clip rect.
   bool IntersectsClipRectInt(int x, int y, int w, int h);
   bool IntersectsClipRect(const Rect& rect);
 
-  // Returns the image rep which best matches the canvas |image_scale_|.
+  // Returns the image rep which best matches the canvas |scale_factor_|.
   // Returns a null image rep if |image| contains no image reps.
   // Builds mip map for returned image rep if necessary.
   //
   // An optional additional user defined scale can be provided.
   const ImageSkiaRep& GetImageRepToPaint(const ImageSkia& image) const;
   const ImageSkiaRep& GetImageRepToPaint(
       const ImageSkia& image,
       float user_defined_scale_factor_x,
       float user_defined_scale_factor_y) const;
 
   // The device scale factor at which drawing on this canvas occurs.
   // An additional scale can be applied via Canvas::Scale(). However,
-  // Canvas::Scale() does not affect |image_scale_|.
-  float image_scale_;
+  // Canvas::Scale() does not affect |scale_factor_|.
+  ui::ScaleFactor scale_factor_;
 
   skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_