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

Unified Diff: ui/gfx/font_list.cc

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win bots Created 7 years, 3 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/font_list.cc
diff --git a/ui/gfx/font_list.cc b/ui/gfx/font_list.cc
index e01483a7cc1e9c811171e56ccd8c448004fb5186..d1d7fb42f6750c1a0169d2018c16b10bbc0bc439 100644
--- a/ui/gfx/font_list.cc
+++ b/ui/gfx/font_list.cc
@@ -177,7 +177,7 @@ int FontList::GetBaseline() const {
return common_baseline_;
}
-int FontList::GetStringWidth(const base::string16& text) const {
+float FontList::GetStringWidth(const base::string16& text) const {
// Rely on the primary font metrics for the time being.
// TODO(yukishiino): Not only the first font, all the fonts in the list should
// be taken into account to compute the pixels needed to display |text|.
@@ -190,7 +190,7 @@ int FontList::GetStringWidth(const base::string16& text) const {
return GetPrimaryFont().GetStringWidth(text);
}
-int FontList::GetExpectedTextWidth(int length) const {
+float FontList::GetExpectedTextWidth(int length) const {
// Rely on the primary font metrics for the time being.
return GetPrimaryFont().GetExpectedTextWidth(length);
}

Powered by Google App Engine
This is Rietveld 408576698