ui/gfx/render_text_win.cc - Issue 8392017: Change string16 to std::string in the gfx::Font() interface.

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: ui/gfx/render_text_win.cc

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix mac unit tests Created 9 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:

Index: ui/gfx/render_text_win.cc

diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc

index 5e0cab54879dc6cdf9b8022ac44d38228f98a32c..0987fd18788fd1ace0b9e243755d67c8b9fac9a6 100644

--- a/ui/gfx/render_text_win.cc

+++ b/ui/gfx/render_text_win.cc

@@ -606,7 +606,7 @@ void RenderTextWin::DrawVisualText(Canvas* canvas) {

internal::TextRun* run = runs_[visual_to_logical_[i]];

// TODO(msw): Font default/fallback and style integration.

- std::string font(UTF16ToASCII(run->font.GetFontName()));

+ std::string font(run->font.GetFontName());

SkTypeface::Style style = SkTypeface::kNormal;

SkTypeface* typeface = SkTypeface::CreateFromName(font.c_str(), style);

if (typeface) {