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

Unified Diff: ui/gfx/font.cc

Issue 9117009: Move |PlatformFont::GetStringWidth()| implementation up into font.cc directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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
« no previous file with comments | « ui/gfx/canvas_skia.cc ('k') | ui/gfx/platform_font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/font.cc
===================================================================
--- ui/gfx/font.cc (revision 118837)
+++ ui/gfx/font.cc (working copy)
@@ -5,6 +5,7 @@
#include "ui/gfx/font.h"
#include "base/utf_string_conversions.h"
+#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/platform_font.h"
namespace gfx {
@@ -59,7 +60,7 @@
}
int Font::GetStringWidth(const string16& text) const {
- return platform_font_->GetStringWidth(text);
+ return CanvasSkia::GetStringWidth(text, *this);
}
int Font::GetExpectedTextWidth(int length) const {
« no previous file with comments | « ui/gfx/canvas_skia.cc ('k') | ui/gfx/platform_font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698