Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: ui/gfx/platform_font_ios.h

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix round-down problems Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/platform_font_ios.h
diff --git a/ui/gfx/platform_font_ios.h b/ui/gfx/platform_font_ios.h
index 2b309550327804fa44ceabdf39785de0d1d098c1..3b825476c8e5028a805b8e5ac90994c0ea5a7cef 100644
--- a/ui/gfx/platform_font_ios.h
+++ b/ui/gfx/platform_font_ios.h
@@ -21,9 +21,9 @@ class PlatformFontIOS : public PlatformFont {
virtual int GetHeight() const OVERRIDE;
virtual int GetBaseline() const OVERRIDE;
virtual int GetCapHeight() 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;
@@ -49,7 +49,7 @@ class PlatformFontIOS : public PlatformFont {
int height_;
int ascent_;
int cap_height_;
- int average_width_;
+ float average_width_;
DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS);
};
« ui/gfx/canvas.h ('K') | « ui/gfx/platform_font.h ('k') | ui/gfx/platform_font_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698