diff options
Diffstat (limited to 'gfx/canvas_skia_mac.mm')
| -rw-r--r-- | gfx/canvas_skia_mac.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/canvas_skia_mac.mm b/gfx/canvas_skia_mac.mm index 1c3dcca..fb30055 100644 --- a/gfx/canvas_skia_mac.mm +++ b/gfx/canvas_skia_mac.mm @@ -39,7 +39,7 @@ void CanvasSkia::SizeStringInt(const string16& text, *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 @@ void CanvasSkia::DrawStringInt(const std::wstring& text, 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))); |