| Index: ui/gfx/platform_font_ios.mm
|
| diff --git a/ui/gfx/platform_font_ios.mm b/ui/gfx/platform_font_ios.mm
|
| index 0fd824fcd6373d754d37f6a2c0500d84f310d442..502f1a4788ef55c7e9c6abace09a565ba13362cc 100644
|
| --- a/ui/gfx/platform_font_ios.mm
|
| +++ b/ui/gfx/platform_font_ios.mm
|
| @@ -13,6 +13,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/gfx/font.h"
|
| #include "ui/gfx/font_render_params.h"
|
| +#include "ui/ios/NSString+CrStringDrawing.h"
|
|
|
| namespace gfx {
|
|
|
| @@ -112,12 +113,7 @@ void PlatformFontIOS::CalculateMetrics() {
|
| height_ = font.lineHeight;
|
| ascent_ = font.ascender;
|
| cap_height_ = font.capHeight;
|
| - if (font) {
|
| - NSDictionary* attributes = @{ NSFontAttributeName : font };
|
| - average_width_ = std::ceil([@"x" sizeWithAttributes:attributes].width);
|
| - } else {
|
| - average_width_ = 0;
|
| - }
|
| + average_width_ = [@"x" cr_sizeWithFont:font].width;
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|