Remove the last remaining PLATFORM() bits from WebCore.

Source/WebCore/platform/mac/WebFontCache.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 83 matching lines @@
     int candidateWeightDeltaMagnitude = abs(candidateWeight - desiredWeight);
 
     // If both are the same distance from the desired weight, prefer the candidate if it is further from medium.
     if (chosenWeightDeltaMagnitude == candidateWeightDeltaMagnitude)
         return abs(candidateWeight - 6) > abs(chosenWeight - 6);
 
     // Otherwise, prefer the one closer to the desired weight.
     return candidateWeightDeltaMagnitude < chosenWeightDeltaMagnitude;
 }
 
-// Workaround for <rdar://problem/5781372>.
-static inline void fixUpWeight(NSInteger& weight, NSString *fontName)
-{
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-    UNUSED_PARAM(weight);
-    UNUSED_PARAM(fontName);
-#else
-    if (weight == 3 && [fontName rangeOfString:@"ultralight" options:NSCaseInsensitiveSearch | NSBackwardsSearch | NSLiteralSearch].location != NSNotFound)
-        weight = 2;
-#endif
-}
-
 static inline FontTraitsMask toTraitsMask(NSFontTraitMask appKitTraits, NSInteger appKitWeight)
 {
     return static_cast<FontTraitsMask>(((appKitTraits & NSFontItalicTrait) ? FontStyleItalicMask : FontStyleNormalMask)
         | FontVariantNormalMask
         | (appKitWeight == 1 ? FontWeight100Mask :
               appKitWeight == 2 ? FontWeight200Mask :
               appKitWeight <= 4 ? FontWeight300Mask :
               appKitWeight == 5 ? FontWeight400Mask :
               appKitWeight == 6 ? FontWeight500Mask :
               appKitWeight <= 8 ? FontWeight600Mask :
@@ skipping 16 matching lines @@
     }
 
     if (!availableFamily) {
         // Match by PostScript name.
         NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator];
         NSString *availableFont;
         while ((availableFont = [availableFonts nextObject])) {
             if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
                 NSFont *font = [NSFont fontWithName:availableFont size:10];
                 NSInteger weight = [fontManager weightOfFont:font];
-                fixUpWeight(weight, desiredFamily);
                 traitsMasks.append(toTraitsMask([fontManager traitsOfFont:font], weight));
                 break;
             }
         }
         return;
     }
 
     NSArray *fonts = [fontManager availableMembersOfFontFamily:availableFamily];    
     unsigned n = [fonts count];
     unsigned i;
     for (i = 0; i < n; i++) {
         NSArray *fontInfo = [fonts objectAtIndex:i];
         // Array indices must be hard coded because of lame AppKit API.
         NSString *fontFullName = [fontInfo objectAtIndex:0];
         NSInteger fontWeight = [[fontInfo objectAtIndex:2] intValue];
-        fixUpWeight(fontWeight, fontFullName);
 
         NSFontTraitMask fontTraits = [[fontInfo objectAtIndex:3] unsignedIntValue];
         traitsMasks.append(toTraitsMask(fontTraits, fontWeight));
     }
 }
 
 // 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 *)internalFontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits weight:(int)desiredWeight size:(float)size
@@ skipping 43 matching lines @@
 
     NSArray *fonts = [fontManager availableMembersOfFontFamily:availableFamily];    
     unsigned n = [fonts count];
     unsigned i;
     for (i = 0; i < n; i++) {
         NSArray *fontInfo = [fonts objectAtIndex:i];
 
         // Array indices must be hard coded because of lame AppKit API.
         NSString *fontFullName = [fontInfo objectAtIndex:0];
         NSInteger fontWeight = [[fontInfo objectAtIndex:2] intValue];
-        fixUpWeight(fontWeight, fontFullName);
 
         NSFontTraitMask fontTraits = [[fontInfo objectAtIndex:3] unsignedIntValue];
 
         BOOL newWinner;
         if (!choseFont)
             newWinner = acceptableChoice(desiredTraits, fontTraits);
         else
             newWinner = betterChoice(desiredTraits, desiredWeight, chosenTraits, chosenWeight, fontTraits, fontWeight);
 
         if (newWinner) {
@@ skipping 58 matching lines @@
     return [self internalFontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
 }
 
 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits size:(float)size
 {
     int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5;
     return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
 }
 
 @end