Refactor fx_font part 1

core/fxge/ge/fx_ge_text.cpp

Index: core/fxge/ge/fx_ge_text.cpp
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 5fea141a427f664887227cc5eeb06afd1c4b436c..d7c16e1890c32cc23b1e0fb0e3a683fa1cf6d2c7 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -106,88 +106,6 @@ FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs,
   return rect;
 }
 
-CFX_FontCache::CFX_FontCache() {}
-
-CFX_FontCache::~CFX_FontCache() {
-  FreeCache(TRUE);
-}
-
-CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) {
-  FXFT_Face internal_face = pFont->GetFace();
-  const bool bExternal = !internal_face;
-  FXFT_Face face =
-      bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
-  CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
-  auto it = map.find(face);
-  if (it != map.end()) {
-    CFX_CountedFaceCache* counted_face_cache = it->second;
-    counted_face_cache->m_nCount++;
-    return counted_face_cache->m_Obj;
-  }
-
-  CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face);
-  CFX_CountedFaceCache* counted_face_cache = new CFX_CountedFaceCache;
-  counted_face_cache->m_nCount = 2;
-  counted_face_cache->m_Obj = face_cache;
-  map[face] = counted_face_cache;
-  return face_cache;
-}
-
-#ifdef _SKIA_SUPPORT_
-CFX_TypeFace* CFX_FontCache::GetDeviceCache(CFX_Font* pFont) {
-  return GetCachedFace(pFont)->GetDeviceCache(pFont);
-}
-
-CFX_TypeFace* CFX_FaceCache::GetDeviceCache(CFX_Font* pFont) {
-  if (!m_pTypeface) {
-    m_pTypeface =
-        SkTypeface::MakeFromStream(
-            new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()))
-            .release();
-  }
-  return m_pTypeface;
-}
-#endif
-
-void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) {
-  FXFT_Face internal_face = pFont->GetFace();
-  const bool bExternal = !internal_face;
-  FXFT_Face face =
-      bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
-  CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
-
-  auto it = map.find(face);
-  if (it == map.end())
-    return;
-
-  CFX_CountedFaceCache* counted_face_cache = it->second;
-  if (counted_face_cache->m_nCount > 1) {
-    counted_face_cache->m_nCount--;
-  }
-}
-
-void CFX_FontCache::FreeCache(FX_BOOL bRelease) {
-  for (auto it = m_FTFaceMap.begin(); it != m_FTFaceMap.end();) {
-    auto curr_it = it++;
-    CFX_CountedFaceCache* cache = curr_it->second;
-    if (bRelease || cache->m_nCount < 2) {
-      delete cache->m_Obj;
-      delete cache;
-      m_FTFaceMap.erase(curr_it);
-    }
-  }
-
-  for (auto it = m_ExtFaceMap.begin(); it != m_ExtFaceMap.end();) {
-    auto curr_it = it++;
-    CFX_CountedFaceCache* cache = curr_it->second;
-    if (bRelease || cache->m_nCount < 2) {
-      delete cache->m_Obj;
-      delete cache;
-      m_ExtFaceMap.erase(curr_it);
-    }
-  }
-}
-
 CFX_FaceCache::CFX_FaceCache(FXFT_Face face)
     : m_Face(face)
 #ifdef _SKIA_SUPPORT_