Source/platform/fonts/mac/FontFamilyMatcherMac.h - Issue 1276003003: Reland 2: mac: Use a placeholder string for the family name of the system 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: Source/platform/fonts/mac/FontFamilyMatcherMac.h

Issue 1276003003: Reland 2: mac: Use a placeholder string for the family name of the system font. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebaseline Yosemite tests that use bold fonts. Created 5 years, 4 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

« Source/core/layout/LayoutTextControlMultiLine.cpp ('K') | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/fonts/mac/FontFamilyMatcherMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/fonts/mac/FontFamilyMatcherMac.h

diff --git a/Source/platform/fonts/mac/FontFamilyMatcherMac.h b/Source/platform/fonts/mac/FontFamilyMatcherMac.h

index 1a41029c6db1511be4dca9553754febee4bb95fc..be7a951062ff6a2444f7d201d9bd85e5e05376f1 100644

--- a/Source/platform/fonts/mac/FontFamilyMatcherMac.h

+++ b/Source/platform/fonts/mac/FontFamilyMatcherMac.h

@@ -27,13 +27,17 @@

#ifndef FontFamilyMatcherMac_h

#define FontFamilyMatcherMac_h

+#include "platform/PlatformExport.h"

+#include "platform/fonts/FontTraits.h"

#include <AppKit/NSFontManager.h>

namespace blink {

-NSFont* MatchNSFontFamily(NSString* desiredFamily, NSFontTraitMask desiredTraits,

- int desiredWeight, float size);

+PLATFORM_EXPORT NSFont* MatchNSFontFamily(NSString* desiredFamily, NSFontTraitMask desiredTraits,

+ FontWeight desiredWeight, float size);

+// Converts a blink::FontWeight to an AppKit font weight.

+int ToAppKitFontWeight(FontWeight);

tkent 2015/08/11 01:34:36 To -> to

erikchen 2015/08/11 05:21:13 Done.

}

#endif // FontFamilyMatcherMac_h