diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
| commit | b22558a183cefa554a1730188a51994504100351 (patch) | |
| tree | 1761e4f23e2e9060ff7bfa5a9026a4937d73e312 /gfx/canvas_direct2d.h | |
| parent | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (diff) | |
| download | chromium_src-b22558a183cefa554a1730188a51994504100351.zip chromium_src-b22558a183cefa554a1730188a51994504100351.tar.gz chromium_src-b22558a183cefa554a1730188a51994504100351.tar.bz2 | |
Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/canvas_direct2d.h')
| -rw-r--r-- | gfx/canvas_direct2d.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/canvas_direct2d.h b/gfx/canvas_direct2d.h index 740a24d..89ea448 100644 --- a/gfx/canvas_direct2d.h +++ b/gfx/canvas_direct2d.h @@ -57,15 +57,15 @@ class CanvasDirect2D : public Canvas { int dest_x, int dest_y, int dest_w, int dest_h, bool filter, const SkPaint& paint); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, int x, int y, int w, int h); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, const gfx::Rect& display_rect); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, int x, int y, int w, int h, |