Switch non-gdi windows font path to use new SkFontMgr

Source/core/platform/graphics/FontCache.h

Index: Source/core/platform/graphics/FontCache.h
diff --git a/Source/core/platform/graphics/FontCache.h b/Source/core/platform/graphics/FontCache.h
index 905f1cbd0525ce39fc3c35c84b2fc21c6dd0c658..6b7bd65f2c7a9a024bec8a6a52f481bd0a9dc357 100644
--- a/Source/core/platform/graphics/FontCache.h
+++ b/Source/core/platform/graphics/FontCache.h
@@ -45,6 +45,7 @@
 #include <mlang.h>
 #endif
 
+class SkFontMgr;
 class SkTypeface;
 
 namespace WebCore {
@@ -131,7 +132,7 @@ private:
     FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family);
 
     // Implemented on skia platforms.
-    SkTypeface* createTypeface(const FontDescription&, const AtomicString& family, CString& name);
+    void getFontNameIncludingFallback(const FontDescription&, const AtomicString&, CString& name);
 
     PassRefPtr<SimpleFontData> getFontResourceData(const FontPlatformData*, ShouldRetain = Retain);
     const FontPlatformData* getFallbackFontData(const FontDescription&);
@@ -139,6 +140,10 @@ private:
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
+#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+    SkFontMgr* m_fontManager;

[bungeman-chromium, 2013/08/31 02:57:24]

SkFontMgr is SkRefCnt which is compatible with RefPtr/PassRefPtr, so you may
wish to use RefPtr<SkFontMgr> here. I think this also means that yout don't need
to declare/implement the destructor as the unref/deref is implicit. (Was the
destructor really declared but never defined?)

[reed1, 2013/09/03 17:38:46]

Do we want to have 2 fontmgrs now (one for GDI, one for DW), or do we think
we'll just have one?

[eae, 2013/09/03 21:04:14]

Great, I'll do that.

+#endif
+
 #if OS(DARWIN) || OS(ANDROID)
     friend class ComplexTextController;
 #endif