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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/gfx/platform_font_ios.mm

Issue 473883002: Revert 289403 "Update iOS deployment target to 7.0" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 | « trunk/src/build/common.gypi ('k') | trunk/src/ui/gfx/text_utils_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gfx/platform_font_ios.mm
===================================================================
--- trunk/src/ui/gfx/platform_font_ios.mm (revision 289509)
+++ trunk/src/ui/gfx/platform_font_ios.mm (working copy)
@@ -6,8 +6,6 @@
#import <UIKit/UIKit.h>
-#include <cmath>
-
#include "base/basictypes.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -112,8 +110,7 @@
height_ = font.lineHeight;
ascent_ = font.ascender;
cap_height_ = font.capHeight;
- NSDictionary* attributes = @{ NSFontAttributeName : font };
- average_width_ = std::ceil([@"x" sizeWithAttributes:attributes].width);
+ average_width_ = [@"x" sizeWithFont:font].width;
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/ui/gfx/text_utils_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698