Support the device font cache

core/include/fxge/fx_font.h

Index: core/include/fxge/fx_font.h
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 382a916734949ee0cb72e0e6e5515222ed3787a5..183fa4eba36a6b130e830d8e686b384b219667eb 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -27,6 +27,10 @@ class CFX_SubstFont;
 class CTTFontDesc;
 class IFX_SystemFontInfo;
 
+#ifdef _SKIA_SUPPORT_
+class SkTypeface;

[dsinclair, 2016/04/04 17:09:15]

Should do something like:

using CFX_TypeFace = SkTypeface; and then use CFX_TypeFace below?

[caryclark, 2016/04/04 19:05:11]

Done.

+#endif
+
 #define FXFONT_FIXED_PITCH 0x01
 #define FXFONT_SERIF 0x02
 #define FXFONT_SYMBOLIC 0x04
@@ -452,6 +456,9 @@ class CFX_FontCache {
   CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
   void ReleaseCachedFace(CFX_Font* pFont);
   void FreeCache(FX_BOOL bRelease = FALSE);
+#ifdef _SKIA_SUPPORT_
+  SkTypeface* GetDeviceCache(CFX_Font* pFont);
+#endif
 
  private:
   using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
@@ -490,6 +497,10 @@ class CFX_FaceCache {
                                     FX_DWORD glyph_index,
                                     int dest_width);
 
+#ifdef _SKIA_SUPPORT_
+  SkTypeface* GetDeviceCache(CFX_Font* pFont);
+#endif
+
  private:
   CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont,
                                FX_DWORD glyph_index,
@@ -516,6 +527,9 @@ class CFX_FaceCache {
   std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap;
   std::map<FX_DWORD, CFX_PathData*> m_PathMap;
   CFX_DIBitmap* m_pBitmap;
+#ifdef _SKIA_SUPPORT_
+  SkTypeface* m_pTypeface;
+#endif
 };
 
 struct FXTEXT_GLYPHPOS {