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

Side by Side Diff: ui/gfx/text_utils_ios.mm

Issue 470923005: Reland: Update iOS deployment target to 7.0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nil font handling 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/platform_font_ios.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/text_utils.h" 5 #include "ui/gfx/text_utils.h"
6 6
7 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 10
11 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #include "ui/gfx/font_list.h" 12 #include "ui/gfx/font_list.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 15
16 int GetStringWidth(const base::string16& text, const FontList& font_list) { 16 int GetStringWidth(const base::string16& text, const FontList& font_list) {
17 return std::ceil(GetStringWidthF(text, font_list)); 17 return std::ceil(GetStringWidthF(text, font_list));
18 } 18 }
19 19
20 float GetStringWidthF(const base::string16& text, const FontList& font_list) { 20 float GetStringWidthF(const base::string16& text, const FontList& font_list) {
21 NSString* ns_text = base::SysUTF16ToNSString(text); 21 NSString* ns_text = base::SysUTF16ToNSString(text);
22 NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont(); 22 NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont();
23 return [ns_text sizeWithFont:native_font].width; 23 if (!native_font)
24 return 0;
25 NSDictionary* attributes = @{ NSFontAttributeName : native_font };
26 return std::ceil([ns_text sizeWithAttributes:attributes].width);
24 } 27 }
25 28
26 } // namespace gfx 29 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_ios.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698