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

Unified Diff: ui/gfx/text_utils_ios.mm

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch Created 7 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
Index: ui/gfx/text_utils_ios.mm
diff --git a/ui/gfx/text_utils_ios.mm b/ui/gfx/text_utils_ios.mm
index 1841864ff85f6e33e3fbfe16323ad11c9812caa7..246923c4e81934c15652cd7638b431d0b762b7da 100644
--- a/ui/gfx/text_utils_ios.mm
+++ b/ui/gfx/text_utils_ios.mm
@@ -6,17 +6,15 @@
#import <UIKit/UIKit.h>
-#include <cmath>
-
#include "base/strings/sys_string_conversions.h"
#include "ui/gfx/font_list.h"
namespace gfx {
-int GetStringWidth(const base::string16& text, const FontList& font_list) {
+float GetStringWidth(const base::string16& text, const FontList& font_list) {
NSString* ns_text = base::SysUTF16ToNSString(text);
NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont();
- return std::ceil([ns_text sizeWithFont:native_font].width);
+ return [ns_text sizeWithFont:native_font].width;
}
} // namespace gfx

Powered by Google App Engine
This is Rietveld 408576698