ui/gfx/platform_font_ios.mm - Issue 463333002: Update iOS deployment target to 7.0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/platform_font_ios.mm

Issue 463333002: Update iOS deployment target to 7.0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Switch to std::ceil 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:

Index: ui/gfx/platform_font_ios.mm

diff --git a/ui/gfx/platform_font_ios.mm b/ui/gfx/platform_font_ios.mm

index 03f5ddbe75a6e986c4f8d2770369d96a60ba53fe..1494659a86827cd0e9898de43519ba6d09e395e9 100644

--- a/ui/gfx/platform_font_ios.mm

+++ b/ui/gfx/platform_font_ios.mm

@@ -6,6 +6,8 @@

#import <UIKit/UIKit.h>

+#include <cmath>

#include "base/basictypes.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

@@ -110,7 +112,8 @@ void PlatformFontIOS::CalculateMetrics() {

height_ = font.lineHeight;

ascent_ = font.ascender;

cap_height_ = font.capHeight;

- average_width_ = [@"x" sizeWithFont:font].width;

+ NSDictionary* attributes = @{ NSFontAttributeName : font };

+ average_width_ = std::ceil([@"x" sizeWithAttributes:attributes].width);

}

////////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « build/common.gypi ('k') | ui/gfx/text_utils_ios.mm » ('j') | no next file with comments »