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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gfx/canvas_skia_mac.mm

Issue 6121004: Remove wstring from gfx. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | « gfx/canvas_skia_linux.cc ('k') | gfx/canvas_skia_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/canvas_skia_mac.mm
===================================================================
--- gfx/canvas_skia_mac.mm (revision 71043)
+++ gfx/canvas_skia_mac.mm (working copy)
@@ -39,7 +39,7 @@
*height = font.GetHeight();
}
-void CanvasSkia::DrawStringInt(const std::wstring& text,
+void CanvasSkia::DrawStringInt(const string16& text,
const gfx::Font& font,
const SkColor& color,
int x, int y, int w, int h,
@@ -68,8 +68,8 @@
nil];
NSAttributedString* ns_string =
- [[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text)
- attributes:attributes] autorelease];
+ [[[NSAttributedString alloc] initWithString:base::SysUTF16ToNSString(text)
+ attributes:attributes] autorelease];
base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter(
CTFramesetterCreateWithAttributedString(
reinterpret_cast<CFAttributedStringRef>(ns_string)));
« no previous file with comments | « gfx/canvas_skia_linux.cc ('k') | gfx/canvas_skia_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698