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

Source/core/layout/LayoutThemeMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 19 matching lines @@
 #import "core/layout/LayoutView.h"
 #import "core/paint/MediaControlsPainter.h"
 #import "core/style/AuthorStyleInfo.h"
 #import "core/style/ShadowList.h"
 #import "platform/LayoutTestSupport.h"
 #import "platform/PlatformResourceLoader.h"
 #import "platform/graphics/BitmapImage.h"
 #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"
 #import <AvailabilityMacros.h>
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <math.h>
 
 // The methods in this file are specific to the Mac OS X platform.
 
@@ skipping 181 matching lines @@
 void LayoutThemeMac::systemFont(CSSValueID systemFontID, FontStyle& fontStyle, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily) const
 {
     NSFont* font = systemNSFont(systemFontID);
     if (!font)
         return;
 
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
     fontStyle = ([fontManager traitsOfFont:font] & NSItalicFontMask) ? FontStyleItalic : FontStyleNormal;
     fontWeight = toFontWeight([fontManager weightOfFont:font]);
     fontSize = [font pointSize];
-    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";
+    fontFamily = [font webCoreFamilyName];
 }
 
 static RGBA32 convertNSColorToColor(NSColor *color)
 {
     NSColor *colorInColorSpace = [color colorUsingColorSpaceName:NSDeviceRGBColorSpace];
     if (colorInColorSpace) {
         static const double scaleFactor = nextafter(256.0, 0.0);
         return makeRGB(static_cast<int>(scaleFactor * [colorInColorSpace redComponent]),
             static_cast<int>(scaleFactor * [colorInColorSpace greenComponent]),
             static_cast<int>(scaleFactor * [colorInColorSpace blueComponent]));
@@ skipping 333 matching lines @@
         style.setHeight(Length(size.height(), Fixed));
 }
 
 void LayoutThemeMac::setFontFromControlSize(ComputedStyle& style, NSControlSize controlSize) const
 {
     FontDescription fontDescription;
     fontDescription.setIsAbsoluteSize(true);
     fontDescription.setGenericFamily(FontDescription::SerifFamily);
 
     NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]];
-    fontDescription.firstFamily().setFamily(@"BlinkMacSystemFont");
+    fontDescription.firstFamily().setFamily([font webCoreFamilyName]);
     fontDescription.setComputedSize([font pointSize] * style.effectiveZoom());
     fontDescription.setSpecifiedSize([font pointSize] * style.effectiveZoom());
 
     // Reset line height.
     style.setLineHeight(ComputedStyle::initialLineHeight());
 
     // TODO(esprehn): The fontSelector manual management is buggy and error prone.
     FontSelector* fontSelector = style.font().fontSelector();
     if (style.setFontDescription(fontDescription))
         style.font().update(fontSelector);
@@ skipping 552 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink