Index: Source/core/layout/LayoutThemeMac.mm |
diff --git a/Source/core/layout/LayoutThemeMac.mm b/Source/core/layout/LayoutThemeMac.mm |
index 507401a54c330e01c516e1c3b519c2e217e4f3e7..7ada83ecad5247fb21a71254a20e95fa39befc13 100644 |
--- a/Source/core/layout/LayoutThemeMac.mm |
+++ b/Source/core/layout/LayoutThemeMac.mm |
@@ -37,6 +37,7 @@ |
#import "platform/mac/ColorMac.h" |
#import "platform/mac/LocalCurrentGraphicsContext.h" |
#import "platform/mac/ThemeMac.h" |
+#import "platform/mac/VersionUtilMac.h" |
#import "platform/mac/WebCoreNSCellExtras.h" |
#import "platform/text/PlatformLocale.h" |
#import "platform/text/StringTruncator.h" |
@@ -238,7 +239,14 @@ void LayoutThemeMac::systemFont(CSSValueID systemFontID, FontStyle& fontStyle, F |
fontStyle = ([fontManager traitsOfFont:font] & NSItalicFontMask) ? FontStyleItalic : FontStyleNormal; |
fontWeight = toFontWeight([fontManager weightOfFont:font]); |
fontSize = [font pointSize]; |
- fontFamily = [font webCoreFamilyName]; |
+ fontFamily = @"BlinkMacSystemFont"; |
+} |
+ |
+bool LayoutThemeMac::needsHackForTextControlWithFontFamily(const AtomicString& family) const |
+{ |
+ // This hack is only applied on OSX 10.9 and earlier. |
+ // https://code.google.com/p/chromium/issues/detail?id=515989#c8 |
+ return IsOSMavericksOrEarlier() && family == "BlinkMacSystemFont"; |
} |
static RGBA32 convertNSColorToColor(NSColor *color) |
@@ -592,7 +600,7 @@ void LayoutThemeMac::setFontFromControlSize(ComputedStyle& style, NSControlSize |
fontDescription.setGenericFamily(FontDescription::SerifFamily); |
NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]]; |
- fontDescription.firstFamily().setFamily([font webCoreFamilyName]); |
+ fontDescription.firstFamily().setFamily(@"BlinkMacSystemFont"); |
fontDescription.setComputedSize([font pointSize] * style.effectiveZoom()); |
fontDescription.setSpecifiedSize([font pointSize] * style.effectiveZoom()); |