Source/platform/fonts/FontPlatformData.h - Issue 691733004: Do not use SkCreateTypefaceFromCTFont for custom fonts

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/platform/fonts/FontPlatformData.h

Issue 691733004: Do not use SkCreateTypefaceFromCTFont for custom fonts (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: removed lion-specific test expectations Created 6 years, 1 month 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 | « LayoutTests/platform/mac-lion/virtual/antialiasedtext/fast/text/font-variant-width-expected.txt ('k') | Source/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/fonts/FontPlatformData.h

diff --git a/Source/platform/fonts/FontPlatformData.h b/Source/platform/fonts/FontPlatformData.h

index fcfa63c80b9900b624257a62c68edc2a3d447d72..1a44b36f37e4b743cbe09b9e245229bad7598b0a 100644

--- a/Source/platform/fonts/FontPlatformData.h

+++ b/Source/platform/fonts/FontPlatformData.h

@@ -80,7 +80,7 @@ public:

#if OS(MACOSX)

FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false,

FontOrientation = Horizontal, FontWidthVariant = RegularWidth);

- FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);

+ FontPlatformData(CGFontRef, PassRefPtr<SkTypeface>, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);

#else

FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());

#endif