Refactor fx_font part 1

core/fxge/include/cfx_fontcache.h

Index: core/fxge/include/cfx_fontcache.h
diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h
new file mode 100644
index 0000000000000000000000000000000000000000..90d562edd226b181607ebac4fdbc51ff9fba8303
--- /dev/null
+++ b/core/fxge/include/cfx_fontcache.h
@@ -0,0 +1,42 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
+#define CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_
+
+#include <map>
+
+#include "core/fxcrt/include/fx_system.h"
+#include "core/fxge/include/fx_font.h"
+#include "core/fxge/include/fx_freetype.h"
+
+class CFX_FontCache {
+ public:
+  CFX_FontCache();
+  ~CFX_FontCache();
+  CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
+  void ReleaseCachedFace(CFX_Font* pFont);
+  void FreeCache(FX_BOOL bRelease = FALSE);
+#ifdef _SKIA_SUPPORT_
+  CFX_TypeFace* GetDeviceCache(CFX_Font* pFont);
+#endif
+
+ private:
+  using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
+  CFX_FTCacheMap m_FTFaceMap;
+  CFX_FTCacheMap m_ExtFaceMap;
+};
+
+class CFX_AutoFontCache {

[dsinclair, 2016/08/17 18:30:52]

Can we move this to cfx_autofontcache.{cpp,h}

[npm, 2016/08/17 20:19:21]

Done.

+ public:
+  CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont)
+      : m_pFontCache(pFontCache), m_pFont(pFont) {}
+  ~CFX_AutoFontCache() { m_pFontCache->ReleaseCachedFace(m_pFont); }

[dsinclair, 2016/08/17 18:30:52]

nit: blank line after destructor.

[npm, 2016/08/17 20:19:21]

Done.

+  CFX_FontCache* m_pFontCache;

[dsinclair, 2016/08/17 18:30:52]

Can these be private?

[npm, 2016/08/17 20:19:21]

Done.

+  CFX_Font* m_pFont;
+};
+
+#endif  // CORE_FXGE_INCLUDE_CFX_FONTCACHE_H_