Revert 181541 "Merge FontPlatformDataHarfBuzz and FontPlatformData headers"

Source/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 171 matching lines @@
 
     if (!font)
         return nil;
 
     NSFontTraitMask actualTraits = 0;
     if (desiredTraits & NSFontItalicTrait)
         actualTraits = [fontManager traitsOfFont:font];
     int actualWeight = [fontManager weightOfFont:font];
 
     bool syntheticBold = desiredWeight >= 7 && actualWeight < 7;
-    bool syntheticItalic = (desiredTraits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
+    bool syntheticOblique = (desiredTraits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
 
     // There are some malformed fonts that will be correctly returned by -fontWithFamily:traits:weight:size: as a match for a particular trait,
     // though -[NSFontManager traitsOfFont:] incorrectly claims the font does not have the specified trait. This could result in applying 
     // synthetic bold on top of an already-bold font, as reported in <http://bugs.webkit.org/show_bug.cgi?id=6146>. To work around this
     // problem, if we got an apparent exact match, but the requested traits aren't present in the matched font, we'll try to get a font from 
     // the same family without those traits (to apply the synthetic traits to later).
     NSFontTraitMask nonSyntheticTraits = desiredTraits;
 
     if (syntheticBold)
         nonSyntheticTraits &= ~NSBoldFontMask;
 
-    if (syntheticItalic)
+    if (syntheticOblique)
         nonSyntheticTraits &= ~NSItalicFontMask;
 
     if (nonSyntheticTraits != desiredTraits) {
         NSFont *fontWithoutSyntheticTraits = [fontManager fontWithFamily:availableFamily traits:nonSyntheticTraits weight:chosenWeight size:size];
         if (fontWithoutSyntheticTraits)
             font = fontWithoutSyntheticTraits;
     }
 
     return font;
 }
@@ skipping 11 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