Improve CSS Style matching spec compliance

Source/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
 {
     FontDescription substituteDescription(fontDescription);
     substituteDescription.setStyle(FontStyleNormal);
     substituteDescription.setWeight(FontWeightNormal);
 
     FontFaceCreationParams creationParams(substituteDescription.family().family());
     FontPlatformData* substitutePlatformData = getFontPlatformData(substituteDescription, creationParams);
     if (substitutePlatformData && substitutePlatformData->fontContainsCharacter(character)) {
         FontPlatformData platformData = FontPlatformData(*substitutePlatformData);
         platformData.setSyntheticBold(fontDescription.weight() >= FontWeight600);
-        platformData.setSyntheticItalic(fontDescription.style() == FontStyleItalic);
+        platformData.setSyntheticItalic(fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique);
         return fontDataFromFontPlatformData(&platformData, DoNotRetain);
     }
 
     return nullptr;
 }
 
 #if !OS(WIN) && !OS(ANDROID)
 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*)
 {
     // First try the specified font with standard style & weight.
@@ skipping 20 matching lines @@
     bool shouldSetSyntheticItalic = false;
     FontDescription description(fontDescription);
     if (fallbackFont.isBold && description.weight() < FontWeightBold)
         description.setWeight(FontWeightBold);
     if (!fallbackFont.isBold && description.weight() >= FontWeightBold) {
         shouldSetSyntheticBold = true;
         description.setWeight(FontWeightNormal);
     }
     if (fallbackFont.isItalic && description.style() == FontStyleNormal)
         description.setStyle(FontStyleItalic);
-    if (!fallbackFont.isItalic && description.style() == FontStyleItalic) {
+    if (!fallbackFont.isItalic && (description.style() == FontStyleItalic || description.style() == FontStyleOblique)) {
         shouldSetSyntheticItalic = true;
         description.setStyle(FontStyleNormal);
     }
 
     FontPlatformData* substitutePlatformData = getFontPlatformData(description, creationParams);
     if (!substitutePlatformData)
         return nullptr;
     FontPlatformData platformData = FontPlatformData(*substitutePlatformData);
     platformData.setSyntheticBold(shouldSetSyntheticBold);
     platformData.setSyntheticItalic(shouldSetSyntheticItalic);
@@ skipping 110 matching lines @@
 {
     CString name;
     RefPtr<SkTypeface> tf(createTypeface(fontDescription, creationParams, name));
     if (!tf)
         return 0;
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontSize,
         (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
-        (fontDescription.style() && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
+        ((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         fontDescription.useSubpixelPositioning());
     return result;
 }
 #endif // !OS(WIN)
 
 } // namespace blink