| Index: chrome/common/gfx/chrome_font_win.cc
|
| ===================================================================
|
| --- chrome/common/gfx/chrome_font_win.cc (revision 10454)
|
| +++ chrome/common/gfx/chrome_font_win.cc (working copy)
|
| @@ -43,7 +43,7 @@
|
| }
|
|
|
| int ChromeFont::GetExpectedTextWidth(int length) const {
|
| - return length * font_ref_->dlu_base_x();
|
| + return length * std::min(font_ref_->dlu_base_x(), ave_char_width());
|
| }
|
|
|
| int ChromeFont::style() const {
|
| @@ -75,7 +75,7 @@
|
| // static
|
| ChromeFont::HFontRef* ChromeFont::GetBaseFontRef() {
|
| if (base_font_ref_ == NULL) {
|
| - NONCLIENTMETRICS metrics;
|
| + NONCLIENTMETRICS metrics;
|
| win_util::GetNonClientMetrics(&metrics);
|
|
|
| // See comment in ChromeFont::DeriveFont() about font size.
|
|
|