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

Unified Diff: ui/gfx/platform_font_mac.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_mac.mm
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
index c75bf66f0a0f0912d2d4e0aadbb342fe2e9b047e..ef3b1d10d65823741c5c57a975e260ad79d42ea0 100644
--- a/ui/gfx/platform_font_mac.mm
+++ b/ui/gfx/platform_font_mac.mm
@@ -12,6 +12,7 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
namespace gfx {
@@ -72,6 +73,11 @@ int PlatformFontMac::GetStringWidth(const base::string16& text) const {
Font(const_cast<PlatformFontMac*>(this)));
}
+float PlatformFontMac::GetStringWidthF(const base::string16& text) const {
+ return Canvas::GetStringWidthF(
+ text, FontList(Font(const_cast<PlatformFontMac*>(this))));
+}
+
int PlatformFontMac::GetExpectedTextWidth(int length) const {
return length * average_width_;
}

Powered by Google App Engine
This is Rietveld 408576698