Revert "Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." Br…

Source/platform/mac/ThemeMac.mm

 /*
  * Copyright (C) 2008, 2010, 2011, 2012 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 39 matching lines @@
     return nil;
 }
 
 - (BOOL)_automaticFocusRingDisabled
 {
     return YES;
 }
 
 @end
 
-@implementation NSFont (WebCoreTheme)
-
-- (NSString*)webCoreFamilyName
-{
-    if ([[self familyName] hasPrefix:@"."])
-        return [self fontName];
-
-    return [self familyName];
-}
-
-@end
-
 namespace blink {
 
 Theme* platformTheme()
 {
     DEFINE_STATIC_LOCAL(ThemeMac, themeMac, ());
     return &themeMac;
 }
 
 // Helper functions used by a bunch of different control parts.
 
@@ skipping 469 matching lines @@
 
 FontDescription ThemeMac::controlFont(ControlPart part, const FontDescription& fontDescription, float zoomFactor) const
 {
     switch (part) {
         case PushButtonPart: {
             FontDescription result;
             result.setIsAbsoluteSize(true);
             result.setGenericFamily(FontDescription::SerifFamily);
 
             NSFont* nsFont = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSizeForFont(fontDescription)]];
-            result.firstFamily().setFamily([nsFont webCoreFamilyName]);
+            result.firstFamily().setFamily(@"BlinkMacSystemFont");
             result.setComputedSize([nsFont pointSize] * zoomFactor);
             result.setSpecifiedSize([nsFont pointSize] * zoomFactor);
             return result;
         }
         default:
             return Theme::controlFont(part, fontDescription, zoomFactor);
     }
 }
 
 LengthSize ThemeMac::controlSize(ControlPart part, const FontDescription& fontDescription, const LengthSize& zoomedSize, float zoomFactor) const
@@ skipping 150 matching lines @@
 // focus ring with the frame.
     return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_7;
 #else
 // If compiling an OSX 10.7 or older SDK, OSes up through 10.9 will draw a focus
 // ring with the frame.
     return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9;
 #endif
 }
 
 }