Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." (branch 248

Source/platform/mac/ThemeMac.mm

Index: Source/platform/mac/ThemeMac.mm
diff --git a/Source/platform/mac/ThemeMac.mm b/Source/platform/mac/ThemeMac.mm
index 5218678ef87b1eac58840c2a9c3383cd368220ad..a53db21a8d9a27baf96b12c17bc1d9d33f140d1c 100644
--- a/Source/platform/mac/ThemeMac.mm
+++ b/Source/platform/mac/ThemeMac.mm
@@ -57,6 +57,18 @@
 
 @end
 
+@implementation NSFont (WebCoreTheme)
+
+- (NSString*)webCoreFamilyName
+{
+    if ([[self familyName] hasPrefix:@"."])
+        return [self fontName];
+
+    return [self familyName];
+}
+
+@end
+
 namespace blink {
 
 Theme* platformTheme()
@@ -546,7 +558,7 @@ FontDescription ThemeMac::controlFont(ControlPart part, const FontDescription& f
             result.setGenericFamily(FontDescription::SerifFamily);
 
             NSFont* nsFont = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSizeForFont(fontDescription)]];
-            result.firstFamily().setFamily(@"BlinkMacSystemFont");
+            result.firstFamily().setFamily([nsFont webCoreFamilyName]);
             result.setComputedSize([nsFont pointSize] * zoomFactor);
             result.setSpecifiedSize([nsFont pointSize] * zoomFactor);
             return result;