Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.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/FontPlatformDataChromiumWin.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/FontChromiumWin.cpp ('k') | Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e2a5c05ba5f7df97a238c067ced757fe4dd72fef..5d583451d9dd653b11b55d1f9a18b10e7cd781db 100644

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

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

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

PassRefPtr<SkTypeface> CreateTypefaceFromHFont(HFONT, int* size, int* paintTextFlags);

class FontDescription;

+class GraphicsContext;

class FontPlatformData {

public:

@@ -76,9 +77,7 @@ public:

FontPlatformData(const FontPlatformData&, float textSize);

FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal);

-#if !ENABLE(GDI_FONTS_ON_WINDOWS)

- void setupPaint(SkPaint*) const;

-#endif

+ void setupPaint(SkPaint*, GraphicsContext* = 0) const;

FontPlatformData& operator=(const FontPlatformData&);