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

Unified Diff: ui/gfx/platform_font_ios.mm

Issue 497503004: Add NSString category for providing iOS6-style string drawing APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't cache scale Created 6 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
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | ui/gfx/text_utils_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | ui/gfx/text_utils_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698