gfx/canvas_skia_win.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

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_win.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: gfx/canvas_skia_win.cc

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

--- gfx/canvas_skia_win.cc (revision 55911)

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

@@ -163,7 +163,7 @@

RECT r = { 0, 0, *width, *height };

HDC dc = GetDC(NULL);

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

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

DoDrawText(dc, clamped_string, &r,

ComputeFormatFlags(flags, clamped_string) | DT_CALCRECT);

SelectObject(dc, old_font);

@@ -212,7 +212,7 @@

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);

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

}

// Checks each pixel immediately adjacent to the given pixel in the bitmap. If

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