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

Unified Diff: ui/gfx/platform_font_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: Fix trybots Created 7 years, 2 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/platform_font_ios.mm
diff --git a/ui/gfx/platform_font_ios.mm b/ui/gfx/platform_font_ios.mm
index 92608d322c0ec46295a393aef085e4e2ac79785f..1c373d332da70474ac14dfc5ad0f88ac51399c73 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"
@@ -60,6 +62,10 @@ int PlatformFontIOS::GetAverageCharacterWidth() const {
}
int PlatformFontIOS::GetStringWidth(const base::string16& text) const {
+ return std::ceil(GetStringWidthF(text));
+}
+
+float PlatformFontIOS::GetStringWidthF(const base::string16& text) const {
NSString* ns_text = base::SysUTF16ToNSString(text);
return [ns_text sizeWithFont:GetNativeFont()].width;
}

Powered by Google App Engine
This is Rietveld 408576698