gfx/platform_font_gtk.cc - Issue 5158006: Convert SizeStringInt from taking a wstring to a string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gfx/platform_font_gtk.cc

Issue 5158006: Convert SizeStringInt from taking a wstring to a string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gfx/platform_font_gtk.cc

diff --git a/gfx/platform_font_gtk.cc b/gfx/platform_font_gtk.cc

index 7633c10f22e45c8905832b85930e98c6a9fc4efc..bc4d05bbdec60c9045dd3812f35c2600ba1755f9 100644

--- a/gfx/platform_font_gtk.cc

+++ b/gfx/platform_font_gtk.cc

@@ -221,7 +221,8 @@ int PlatformFontGtk::GetAverageCharacterWidth() const {

int PlatformFontGtk::GetStringWidth(const std::wstring& text) const {

int width = 0, height = 0;

- CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontGtk*>(this)),

+ CanvasSkia::SizeStringInt(WideToUTF16Hack(text),

+ Font(const_cast<PlatformFontGtk*>(this)),

&width, &height, gfx::Canvas::NO_ELLIPSIS);

return width;

}

« no previous file with comments | « gfx/canvas_skia_mac.mm ('k') | gfx/platform_font_mac.mm » ('j') | no next file with comments »