app/gfx/chrome_canvas_win.cc - Issue 113441: ChromeFont->gfx::Font...

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

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/

Patch Set: Created 11 years, 7 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:

Index: app/gfx/chrome_canvas_win.cc

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

--- app/gfx/chrome_canvas_win.cc (revision 16106)

+++ app/gfx/chrome_canvas_win.cc (working copy)

@@ -129,7 +129,7 @@

// static

void ChromeCanvas::SizeStringInt(const std::wstring& text,

- const ChromeFont& font,

+ const gfx::Font& font,

int *width, int *height, int flags) {

HDC dc = GetDC(NULL);

HFONT old_font = static_cast<HFONT>(SelectObject(dc, font.hfont()));

@@ -182,7 +182,7 @@

}

void ChromeCanvas::DrawStringInt(const std::wstring& text,

- const ChromeFont& font,

+ const gfx::Font& font,

const SkColor& color,

int x, int y, int w, int h, int flags) {

DrawStringInt(text, font.hfont(), color, x, y, w, h, flags);

@@ -216,7 +216,7 @@

}

void ChromeCanvas::DrawStringWithHalo(const std::wstring& text,

- const ChromeFont& font,

+ const gfx::Font& font,

const SkColor& text_color,

const SkColor& halo_color_in,

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

« no previous file with comments | « app/gfx/chrome_canvas_linux.cc ('k') | app/gfx/chrome_font.h » ('j') | no next file with comments »