gfx/canvas_skia_linux.cc - Issue 6134010: Revert 71167 - Remove wstring from gfx....

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

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/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

Index: gfx/canvas_skia_linux.cc

===================================================================

--- gfx/canvas_skia_linux.cc (revision 71168)

+++ gfx/canvas_skia_linux.cc (working copy)

@@ -162,7 +162,7 @@

class DrawStringContext {

public:

DrawStringContext(gfx::CanvasSkia* canvas,

- const string16& text,

+ const std::wstring& text,

const gfx::Font& font,

const gfx::Rect& bounds,

const gfx::Rect& clip,

@@ -191,7 +191,7 @@

};

DrawStringContext::DrawStringContext(gfx::CanvasSkia* canvas,

- const string16& text,

+ const std::wstring& text,

const gfx::Font& font,

const gfx::Rect& bounds,

const gfx::Rect& clip,

@@ -211,7 +211,8 @@

cr_ = canvas_->beginPlatformPaint();

layout_ = pango_cairo_create_layout(cr_);

- SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);

+ SetupPangoLayout(layout_, WideToUTF16Hack(text), font, bounds_.width(),

+ flags_);

pango_layout_set_height(layout_, bounds_.height() * PANGO_SCALE);

@@ -345,7 +346,7 @@

cairo_surface_destroy(surface);

}

-void CanvasSkia::DrawStringWithHalo(const string16& text,

+void CanvasSkia::DrawStringWithHalo(const std::wstring& text,

const gfx::Font& font,

const SkColor& text_color,

const SkColor& halo_color,

@@ -360,7 +361,7 @@

context.DrawWithHalo(text_color, halo_color);

}

-void CanvasSkia::DrawStringInt(const string16& text,

+void CanvasSkia::DrawStringInt(const std::wstring& text,

const gfx::Font& font,

const SkColor& color,

int x, int y, int w, int h,

« no previous file with comments | « gfx/canvas_skia.cc ('k') | gfx/canvas_skia_mac.mm » ('j') | no next file with comments »