Switch non-gdi windows font path to use new SkFontMgr

Source/core/platform/graphics/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 27 matching lines @@
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/unicode/Unicode.h"
 
 #if OS(WINDOWS)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
 #endif
 
+class SkFontMgr;
 class SkTypeface;
 
 namespace WebCore {
 
 class Font;
 class FontPlatformData;
 class FontData;
 class FontDescription;
 class FontSelector;
 class OpenTypeVerticalData;
@@ skipping 66 matching lines @@
     void purgeInactiveFontDataIfNeeded();
 
     // FIXME: This method should eventually be removed.
     FontPlatformData* getFontResourcePlatformData(const FontDescription&, const AtomicString& family, bool checkingAlternateName = false);
 
     // These methods are implemented by each platform.
     PassRefPtr<SimpleFontData> getSimilarFontPlatformData(const Font&);
     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&);
 
     // 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
     friend class SimpleFontData; // For getFontResourceData(const FontPlatformData*)
     friend class FontFallbackList;
 };
 
 // Get the global fontCache.
 FontCache* fontCache();
 
 class FontCachePurgePreventer {
 public:
     FontCachePurgePreventer() { fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { fontCache()->enablePurging(); }
 };
 
 }
 
 #endif