Use Skia for font selection on windows

Source/core/platform/graphics/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 28 matching lines @@
 #include "wtf/Assertions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
 void FontCache::platformInit()
 {
 }
 
+#if !OS(WINDOWS)
 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)
 {
     icu::Locale locale = icu::Locale::getDefault();
     FontCache::SimpleFontFamily family;
     FontCache::getFontFamilyForCharacter(c, locale.getLanguage(), &family);
     if (family.name.isEmpty())
         return 0;
 
     AtomicString atomicFamily(family.name);
     // Changes weight and/or italic of given FontDescription depends on
@@ skipping 17 matching lines @@
 
     FontPlatformData* substitutePlatformData = getFontResourcePlatformData(description, atomicFamily, DoNotRetain);
     if (!substitutePlatformData)
         return 0;
     FontPlatformData platformData = FontPlatformData(*substitutePlatformData);
     platformData.setFakeBold(shouldSetFakeBold);
     platformData.setFakeItalic(shouldSetFakeItalic);
     return getFontResourceData(&platformData, DoNotRetain);
 }
 
+#endif // !OS(WINDOWNS)
+
 PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& font)
 {
     return 0;
 }
 
 PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain)
 {
     const FontPlatformData* fontPlatformData = getFallbackFontData(description);
     if (!fontPlatformData) {
         // we should at least have Arial; this is the SkFontHost_fontconfig last resort fallback
         DEFINE_STATIC_LOCAL(const AtomicString, arialStr, ("Arial", AtomicString::ConstructFromLiteral));
         fontPlatformData = getFontResourcePlatformData(description, arialStr);
     }
 
     ASSERT(fontPlatformData);
     return getFontResourceData(fontPlatformData, shouldRetain);
 }
 
 void FontCache::getTraitsInFamily(const AtomicString& familyName,
                                   Vector<unsigned>& traitsMasks)
 {
     notImplemented();
 }
 
-FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription,
-                                                    const AtomicString& family)
+SkTypeface* FontCache::createTypeface(const FontDescription& fontDescription, const AtomicString& family, CString& name)
 {
-    const char* name = 0;
-    CString s;
+    name = "";
 
     // If we're creating a fallback font (e.g. "-webkit-monospace"), convert the name into
     // the fallback name (like "monospace") that fontconfig understands.
     if (!family.length() || family.startsWith("-webkit-")) {
         static const struct {
             FontDescription::GenericFamilyType mType;
             const char* mName;
         } fontDescriptions[] = {
             { FontDescription::SerifFamily, "serif" },
             { FontDescription::SansSerifFamily, "sans-serif" },
             { FontDescription::MonospaceFamily, "monospace" },
             { FontDescription::CursiveFamily, "cursive" },
             { FontDescription::FantasyFamily, "fantasy" }
         };
 
         FontDescription::GenericFamilyType type = fontDescription.genericFamily();
         for (unsigned i = 0; i < SK_ARRAY_COUNT(fontDescriptions); i++) {
             if (type == fontDescriptions[i].mType) {
                 name = fontDescriptions[i].mName;
                 break;
             }
         }
-        if (!name)
-            name = "";
     } else {
         // convert the name to utf8
-        s = family.string().utf8();
-        name = s.data();
+        name = family.string().utf8();
     }
 
     int style = SkTypeface::kNormal;
     if (fontDescription.weight() >= FontWeightBold)
         style |= SkTypeface::kBold;
     if (fontDescription.italic())
         style |= SkTypeface::kItalic;
 
-    SkTypeface* tf = SkTypeface::CreateFromName(name, static_cast<SkTypeface::Style>(style));
+    return SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style));
+}
+
+#if !OS(WINDOWS)
+FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family)
+{
+    CString name;
+    SkTypeface* tf = createTypeface(fontDescription, family, name);
     if (!tf)
         return 0;
 
-    FontPlatformData* result =
-        new FontPlatformData(tf,
-                             name,
-                             fontDescription.computedSize(),
-                             (style & SkTypeface::kBold) && !tf->isBold(),
-                             (style & SkTypeface::kItalic) && !tf->isItalic(),
-                             fontDescription.orientation());
+    FontPlatformData* result = new FontPlatformData(tf,
+        name.data(),
+        fontDescription.computedSize(),
+        fontDescription.weight() >= FontWeightBold && !tf->isBold(),
+        fontDescription.italic() && !tf->isItalic(),
+        fontDescription.orientation());
     tf->unref();
     return result;
 }
+#endif // !OS(WINDOWNS)
 
 } // namespace WebCore