Switch non-gdi windows font path to use new SkFontMgr

Source/core/platform/graphics/skia/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 14 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/platform/graphics/FontCache.h"
 
+#include "SkFontMgr.h"
+#include "SkTypeface_win.h"
 #include "core/platform/NotImplemented.h"
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/SimpleFontData.h"
 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.h"
 #include "core/platform/graphics/chromium/FontUtilsChromiumWin.h"
 
 namespace WebCore {
 
+FontCache::FontCache()
+    : m_purgePreventCount(0)
+{
+    m_fontManager = SkFontMgr_New_GDI();
+}
+
+FontCache::~FontCache()
+{
+    m_fontManager->unref();
+}
+
+
 static bool fontContainsCharacter(const FontPlatformData* fontData, const wchar_t* family, UChar32 character)
 {
     SkPaint paint;
     fontData->setupPaint(&paint);
     paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
 
     uint16_t glyph;
     paint.textToGlyphs(&character, sizeof(character), &glyph);
     return glyph != 0;
 }
@@ skipping 108 matching lines @@
         }
     }
     actualFamilies->unref();
 
     return matchesRequestedFamily;
 }
 
 FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family)
 {
     CString name;
-    SkTypeface* tf = createTypeface(fontDescription, family, name);
+    getFontNameIncludingFallback(fontDescription, family, name);
+
+    // FIXME: Use SkFontStyle and matchFamilyStyle instead of legacyCreateTypeface.
+    int style = SkTypeface::kNormal;
+    if (fontDescription.weight() >= FontWeightBold)
+        style |= SkTypeface::kBold;
+    if (fontDescription.italic())
+        style |= SkTypeface::kItalic;
+
+    SkTypeface* tf = m_fontManager->legacyCreateTypeface(name.data(), style);
     if (!tf)
         return 0;
 
     // Windows will always give us a valid pointer here, even if the face name
     // is non-existent. We have to double-check and see if the family name was
     // really used.
     // FIXME: Do we need to use predefined fonts "guaranteed" to exist
     // when we're running in layout-test mode?
     if (!typefacesMatchesFamily(tf, family)) {
         tf->unref();
         return 0;
     }
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontDescription.computedSize(),
         fontDescription.weight() >= FontWeightBold && !tf->isBold(),
         fontDescription.italic() && !tf->isItalic(),
         fontDescription.orientation());
     tf->unref();
     return result;
 }
 
 }