Enable "system-ui" generic font family

third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * 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.
@@ skipping 14 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import "platform/fonts/mac/FontFamilyMatcherMac.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <math.h>
+#include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontTraits.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/mac/VersionUtilMac.h"
 #import "wtf/HashSet.h"
 #import "wtf/text/AtomicStringHash.h"
 
 @interface NSFont (YosemiteAdditions)
 + (NSFont*)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight;
 @end
 
@@ skipping 73 matching lines @@
     return abs(candidateWeight - 6) > abs(chosenWeight - 6);
 
   // Otherwise, prefer the one closer to the desired weight.
   return candidateWeightDeltaMagnitude < chosenWeightDeltaMagnitude;
 }
 
 // Family name is somewhat of a misnomer here.  We first attempt to find an
 // exact match comparing the desiredFamily to the PostScript name of the
 // installed fonts.  If that fails we then do a search based on the family
 // names of the installed fonts.
-NSFont* MatchNSFontFamily(NSString* desiredFamily,
+NSFont* MatchNSFontFamily(const AtomicString& desiredFamilyString,
                           NSFontTraitMask desiredTraits,
                           FontWeight desiredWeight,
                           float size) {
-  if ([desiredFamily isEqualToString:@"BlinkMacSystemFont"]) {
+  DCHECK_NE(desiredFamilyString, FontCache::legacySystemFontFamily());
+  if (desiredFamilyString == FontFamilyNames::system_ui) {
     // On OSX 10.9, the default system font depends on the SDK version. When
     // compiled against the OSX 10.10 SDK, the font is .LucidaGrandeUI. When
     // compiled against the OSX 10.6 SDK, the font is Lucida Grande. Layout
     // tests don't support different expectations based on the SDK version,
     // so force layout tests to use "Lucida Grande". Once the 10.10 SDK
     // switch is made, this should be changed to return .LucidaGrandeUI and
     // the Layout Expectations should be updated. http://crbug.com/515836.
     if (LayoutTestSupport::isRunningLayoutTest() && IsOS10_9()) {
       if (desiredWeight >= blink::FontWeightBold)
         return [NSFont fontWithName:@"Lucida Grande Bold" size:size];
@@ skipping 13 matching lines @@
       font = [NSFont systemFontOfSize:size
                                weight:toYosemiteFontWeight(desiredWeight)];
     }
 
     if (desiredTraits & IMPORTANT_FONT_TRAITS)
       font = [[NSFontManager sharedFontManager] convertFont:font
                                                 toHaveTrait:desiredTraits];
     return font;
   }
 
+  NSString* desiredFamily = desiredFamilyString;
   NSFontManager* fontManager = [NSFontManager sharedFontManager];
 
   // Do a simple case insensitive search for a matching font family.
   // NSFontManager requires exact name matches.
   // This addresses the problem of matching arial to Arial, etc., but perhaps
   // not all the issues.
   NSEnumerator* e = [[fontManager availableFontFamilies] objectEnumerator];
   NSString* availableFamily;
   while ((availableFamily = [e nextObject])) {
     if ([desiredFamily caseInsensitiveCompare:availableFamily] == NSOrderedSame)
@@ skipping 126 matching lines @@
       6,   // FontWeight500
       8,   // FontWeight600
       9,   // FontWeight700
       10,  // FontWeight800
       12,  // FontWeight900
   };
   return appKitFontWeights[fontWeight];
 }
 
 }  // namespace blink