Implement support for numeric font-weights on Windows

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 146 matching lines @@
     if (!fontPlatformData) {
         DEFINE_STATIC_LOCAL(const FontFaceCreationParams, mssansserifCreationParams, (AtomicString("Microsoft Sans Serif", AtomicString::ConstructFromLiteral)));
         fontPlatformData = getFontPlatformData(description, mssansserifCreationParams);
     }
 #endif
 
     ASSERT(fontPlatformData);
     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
 }
 
+#if OS(WIN)
+static inline SkFontStyle fontStyle(const FontDescription& fontDescription)
+{
+    int width = SkFontStyle::kNormal_Width;
+    int weight = (fontDescription.weight() - FontWeight100 + 1) * 100;
+    SkFontStyle::Slant slant = fontDescription.style() == FontStyleItalic
+        ? SkFontStyle::kItalic_Slant
+        : SkFontStyle::kUpright_Slant;
+    return SkFontStyle(weight, width, slant);
+}
+#endif
+
 PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDescription, const FontFaceCreationParams& creationParams, CString& name)
 {
 #if !OS(WIN) && !OS(ANDROID)
     if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) {
         // TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after
         // https://code.google.com/p/skia/issues/detail?id=1186 gets fixed.
         SkTypeface* typeface = nullptr;
         if (blink::Platform::current()->sandboxSupport())
             typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()));
         else
@@ skipping 15 matching lines @@
     }
 
     int style = SkTypeface::kNormal;
     if (fontDescription.weight() >= FontWeight600)
         style |= SkTypeface::kBold;
     if (fontDescription.style())
         style |= SkTypeface::kItalic;
 
 #if OS(WIN)
     if (s_sideloadedFonts) {
-        HashMap<String, SkTypeface*>::iterator sideloadedFont = s_sideloadedFonts->find(name.data());
-        if (sideloadedFont != s_sideloadedFonts->end()) {
+        HashMap<String, SkTypeface*>::iterator sideloadedFont =
+            s_sideloadedFonts->find(name.data());
+        if (sideloadedFont != s_sideloadedFonts->end())
             return adoptRef(sideloadedFont->value);
-        }
     }
-    // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface.
-    if (m_fontManager)
-        return adoptRef(m_fontManager->legacyCreateTypeface(name.data(), style));
+
+    if (m_fontManager) {
+        return adoptRef(useDirectWrite()
+            ? m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescription))
+            : m_fontManager->legacyCreateTypeface(name.data(), style)
+            );
+    }
 #endif
 
+    // FIXME: Use m_fontManager, SkFontStyle and matchFamilyStyle instead of
+    // CreateFromName on all platforms.
     return adoptRef(SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style)));
 }
 
 #if !OS(WIN)
 FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const FontFaceCreationParams& creationParams, float fontSize)
 {
     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.orientation(),
         fontDescription.useSubpixelPositioning());
     return result;
 }
 #endif // !OS(WIN)
 
 } // namespace blink