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

Unified Diff: ui/gfx/platform_font_mac.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_mac.h
diff --git a/ui/gfx/platform_font_mac.h b/ui/gfx/platform_font_mac.h
index e9d0714238c7510ba9695bd6d4944e3804ce91f3..401ea4c6e4aca790bcfded6a09d3fe269cf36903 100644
--- a/ui/gfx/platform_font_mac.h
+++ b/ui/gfx/platform_font_mac.h
@@ -22,9 +22,9 @@ class PlatformFontMac : 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;
@@ -50,7 +50,7 @@ class PlatformFontMac : public PlatformFont {
int height_;
int ascent_;
int cap_height_;
- int average_width_;
+ float average_width_;
DISALLOW_COPY_AND_ASSIGN(PlatformFontMac);
};
« ui/gfx/canvas.h ('K') | « ui/gfx/platform_font_ios.mm ('k') | ui/gfx/platform_font_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698