diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 23:44:06 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 23:44:06 +0000 |
| commit | cb8788d6c79b11391d330d2831a9aef4d7ac4441 (patch) | |
| tree | 68302e073c9386f5fadbc065a570d719e6ba5bd1 /gfx/platform_font_win.cc | |
| parent | 8eb4fec4b18e3b647e8148d05aec450c19ebcf69 (diff) | |
| download | chromium_src-cb8788d6c79b11391d330d2831a9aef4d7ac4441.zip chromium_src-cb8788d6c79b11391d330d2831a9aef4d7ac4441.tar.gz chromium_src-cb8788d6c79b11391d330d2831a9aef4d7ac4441.tar.bz2 | |
A small wstring -> string16 cleanup in PlatformFont.
BUG=23581
Review URL: http://codereview.chromium.org/5794001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/platform_font_win.cc')
| -rw-r--r-- | gfx/platform_font_win.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gfx/platform_font_win.cc b/gfx/platform_font_win.cc index 05db587..8191c44 100644 --- a/gfx/platform_font_win.cc +++ b/gfx/platform_font_win.cc @@ -102,10 +102,9 @@ int PlatformFontWin::GetAverageCharacterWidth() const { return font_ref_->ave_char_width(); } -int PlatformFontWin::GetStringWidth(const std::wstring& text) const { +int PlatformFontWin::GetStringWidth(const string16& text) const { int width = 0, height = 0; - CanvasSkia::SizeStringInt(WideToUTF16Hack(text), - Font(const_cast<PlatformFontWin*>(this)), + CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontWin*>(this)), &width, &height, gfx::Canvas::NO_ELLIPSIS); return width; } |