Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1746)

Unified Diff: Source/platform/fonts/mac/FontFamilyMatcherMac.h

Issue 1299653004: Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." (branch 248 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@2485
Patch Set: 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
« no previous file with comments | « 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') | Show Comments 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 59df5b6c164a804bee756916d4a4291fc0a6f4da..1a41029c6db1511be4dca9553754febee4bb95fc 100644
--- a/Source/platform/fonts/mac/FontFamilyMatcherMac.h
+++ b/Source/platform/fonts/mac/FontFamilyMatcherMac.h
@@ -27,17 +27,13 @@
#ifndef FontFamilyMatcherMac_h
#define FontFamilyMatcherMac_h
-#include "platform/PlatformExport.h"
-#include "platform/fonts/FontTraits.h"
#include <AppKit/NSFontManager.h>
namespace blink {
-PLATFORM_EXPORT NSFont* MatchNSFontFamily(NSString* desiredFamily, NSFontTraitMask desiredTraits,
- FontWeight desiredWeight, float size);
+NSFont* MatchNSFontFamily(NSString* desiredFamily, NSFontTraitMask desiredTraits,
+ int desiredWeight, float size);
-// Converts a blink::FontWeight to an AppKit font weight.
-int toAppKitFontWeight(FontWeight);
}
#endif // FontFamilyMatcherMac_h
« no previous file with comments | « Source/platform/fonts/mac/FontCacheMac.mm ('k') | Source/platform/fonts/mac/FontFamilyMatcherMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698