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..1c6975f0eecfa548b01db88adaff40f38f683109 100644
--- a/Source/core/platform/graphics/FontCache.h
+++ b/Source/core/platform/graphics/FontCache.h
@@ -45,6 +45,10 @@
 #include <mlang.h>
 #endif
 
+#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+#include "SkFontMgr.h"
+#endif
+
 class SkTypeface;
 
 namespace WebCore {
@@ -139,6 +143,10 @@ private:
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
+#if OS(WINDOWS) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+    OwnPtr<SkFontMgr> m_fontManager;
+#endif
+
 #if OS(DARWIN) || OS(ANDROID)
     friend class ComplexTextController;
 #endif