| Index: ui/gfx/canvas.h
|
| diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
|
| index 9aa7a0a4e4d6cc126b000520ea9bbca9afcd91f3..2532fd69e13f1068720206a00be245831c851e00 100644
|
| --- a/ui/gfx/canvas.h
|
| +++ b/ui/gfx/canvas.h
|
| @@ -125,26 +125,26 @@ class GFX_EXPORT Canvas {
|
| // 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,
|
| - int* height,
|
| - int line_height,
|
| - int flags);
|
| + static void SizeStringToFit(const base::string16& text,
|
| + const FontList& font_list,
|
| + float* width,
|
| + float* height,
|
| + int line_height,
|
| + int flags);
|
| // Obsolete version. Use the above version which takes FontList.
|
| - static void SizeStringInt(const base::string16& text,
|
| - const Font& font,
|
| - int* width,
|
| - int* height,
|
| - int line_height,
|
| - int flags);
|
| + static void SizeStringToFit(const base::string16& text,
|
| + const Font& font,
|
| + float* width,
|
| + float* height,
|
| + int line_height,
|
| + int flags);
|
|
|
| // Returns the number of horizontal pixels needed to display the specified
|
| // |text| with |font_list|.
|
| - static int GetStringWidth(const base::string16& text,
|
| - const FontList& font_list);
|
| + static float GetStringWidth(const base::string16& text,
|
| + const FontList& font_list);
|
| // Obsolete version. Use the above version which takes FontList.
|
| - static int GetStringWidth(const base::string16& text, const Font& font);
|
| + static float GetStringWidth(const base::string16& text, const Font& font);
|
|
|
| // Returns the default text alignment to be used when drawing text on a
|
| // Canvas based on the directionality of the system locale language.
|
|
|