| Index: ui/gfx/platform_font_ios.h
|
| diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h
|
| index 789b591415dcb83340f03b4a8f52073717abc0fc..819e10a0acb04b168d52a3af4e73fc77b5e52ef2 100644
|
| --- a/ui/gfx/platform_font_ios.h
|
| +++ b/ui/gfx/platform_font_ios.h
|
| @@ -20,9 +20,9 @@ class PlatformFontIOS : public PlatformFont {
|
| virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
|
| virtual int GetHeight() const OVERRIDE;
|
| virtual int GetBaseline() const OVERRIDE;
|
| - virtual int GetAverageCharacterWidth() const OVERRIDE;
|
| - virtual int GetStringWidth(const base::string16& text) const OVERRIDE;
|
| - virtual int GetExpectedTextWidth(int length) const OVERRIDE;
|
| + virtual float GetAverageCharacterWidth() const OVERRIDE;
|
| + virtual float GetStringWidth(const base::string16& text) const OVERRIDE;
|
| + virtual float GetExpectedTextWidth(int length) const OVERRIDE;
|
| virtual int GetStyle() const OVERRIDE;
|
| virtual std::string GetFontName() const OVERRIDE;
|
| virtual int GetFontSize() const OVERRIDE;
|
| @@ -47,7 +47,7 @@ class PlatformFontIOS : public PlatformFont {
|
| // Cached metrics, generated at construction.
|
| int height_;
|
| int ascent_;
|
| - int average_width_;
|
| + float average_width_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS);
|
| };
|
|
|