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

Unified Diff: ui/gfx/platform_font_win.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/platform_font_win.cc
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index 2d4c006f2683e94cec8821df7bb897615712fd28..b9de1f4a5675402c5fe9d76031d8bf7db2f281b0 100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -141,18 +141,18 @@ int PlatformFontWin::GetBaseline() const {
return font_ref_->baseline();
}
-int PlatformFontWin::GetAverageCharacterWidth() const {
+float PlatformFontWin::GetAverageCharacterWidth() const {
return font_ref_->ave_char_width();
}
-int PlatformFontWin::GetStringWidth(const base::string16& text) const {
+float PlatformFontWin::GetStringWidth(const base::string16& text) const {
return Canvas::GetStringWidth(text,
Font(const_cast<PlatformFontWin*>(this)));
}
-int PlatformFontWin::GetExpectedTextWidth(int length) const {
- return length * std::min(font_ref_->GetDluBaseX(),
- GetAverageCharacterWidth());
+float PlatformFontWin::GetExpectedTextWidth(int length) const {
+ return length * std::min<float>(font_ref_->GetDluBaseX(),
+ GetAverageCharacterWidth());
}
int PlatformFontWin::GetStyle() const {

Powered by Google App Engine
This is Rietveld 408576698