Source/core/platform/graphics/chromium/UniscribeHelper.h - Issue 24422003: Merge FontPlatformData::setupPaint and setupPaintForFont on Win

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: Source/core/platform/graphics/chromium/UniscribeHelper.h

Issue 24422003: Merge FontPlatformData::setupPaint and setupPaintForFont on Win (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: w/gdi fix Created 7 years, 3 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 | « Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp ('k') | Source/core/platform/graphics/chromium/UniscribeHelper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/graphics/chromium/UniscribeHelper.h

diff --git a/Source/core/platform/graphics/chromium/UniscribeHelper.h b/Source/core/platform/graphics/chromium/UniscribeHelper.h

index 66826adfed1e1504f6f80288da76797aca90b610..8a724c6d6088e4cf07f4f7d53a44963d299dbded 100644

--- a/Source/core/platform/graphics/chromium/UniscribeHelper.h

+++ b/Source/core/platform/graphics/chromium/UniscribeHelper.h

@@ -46,6 +46,7 @@ namespace WebCore {

class FloatRect;

class FontFeatureSettings;

+class FontPlatformData;

class GraphicsContext;

const unsigned cUniscribeHelperStackRuns = 8;

@@ -197,10 +198,9 @@ public:

// be pre-set.

// The y position is the upper left corner, NOT the baseline.

- void draw(GraphicsContext* graphicsContext, HDC dc,

- int x, int y,

- const FloatRect& textRect,

- int from, int to);

+ void draw(GraphicsContext*, const FontPlatformData&, HDC,

+ int x, int y, const FloatRect& textRect,

+ int from, int to);

// Returns the first glyph assigned to the character at the given offset.

// This function is used to retrieve glyph information when Uniscribe is