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

Unified Diff: gfx/canvas_skia.h

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_direct2d.cc ('k') | gfx/canvas_skia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/canvas_skia.h
===================================================================
--- gfx/canvas_skia.h (revision 71043)
+++ gfx/canvas_skia.h (working copy)
@@ -75,7 +75,7 @@
// we don't do any fancy blurring.
// On Linux, text with halo is created by stroking it with 2px |halo_color|
// then filling it with |text_color|.
- void DrawStringWithHalo(const std::wstring& text,
+ void DrawStringWithHalo(const string16& text,
const gfx::Font& font,
const SkColor& text_color,
const SkColor& halo_color,
@@ -119,15 +119,15 @@
int dest_x, int dest_y, int dest_w, int dest_h,
bool filter,
const SkPaint& paint);
- virtual void DrawStringInt(const std::wstring& text,
+ virtual void DrawStringInt(const string16& text,
const gfx::Font& font,
const SkColor& color,
int x, int y, int w, int h);
- virtual void DrawStringInt(const std::wstring& text,
+ virtual void DrawStringInt(const string16& text,
const gfx::Font& font,
const SkColor& color,
const gfx::Rect& display_rect);
- virtual void DrawStringInt(const std::wstring& text,
+ virtual void DrawStringInt(const string16& text,
const gfx::Font& font,
const SkColor& color,
int x, int y, int w, int h,
@@ -150,7 +150,7 @@
// Draws text with the specified color, font and location. The text is
// aligned to the left, vertically centered, clipped to the region. If the
// text is too big, it is truncated and '...' is added to the end.
- void DrawStringInt(const std::wstring& text,
+ void DrawStringInt(const string16& text,
HFONT font,
const SkColor& color,
int x, int y, int w, int h,
« no previous file with comments | « gfx/canvas_direct2d.cc ('k') | gfx/canvas_skia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698