Index: core/fxge/ge/cfx_fontcache.cpp |
diff --git a/core/fxge/ge/cfx_fontcache.cpp b/core/fxge/ge/cfx_fontcache.cpp |
index 3ecd83c33f8f8b66ffdb987eea6324f5f00e69d1..b2d2d1d6c158a53e9226c51b61e1108df0770fac 100644 |
--- a/core/fxge/ge/cfx_fontcache.cpp |
+++ b/core/fxge/ge/cfx_fontcache.cpp |
@@ -13,7 +13,8 @@ |
CFX_FontCache::CFX_FontCache() {} |
CFX_FontCache::~CFX_FontCache() { |
- FreeCache(TRUE); |
+ ASSERT(m_ExtFaceMap.empty()); |
+ ASSERT(m_FTFaceMap.empty()); |
} |
CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) { |
@@ -22,13 +23,13 @@ CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) { |
CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap; |
auto it = map.find(face); |
if (it != map.end()) { |
- CFX_CountedFaceCache* counted_face_cache = it->second; |
+ 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; |
+ CountedFaceCache* counted_face_cache = new CountedFaceCache; |
counted_face_cache->m_nCount = 2; |
counted_face_cache->m_Obj = face_cache; |
map[face] = counted_face_cache; |
@@ -50,30 +51,12 @@ void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) { |
if (it == map.end()) |
return; |
- CFX_CountedFaceCache* counted_face_cache = it->second; |
- if (counted_face_cache->m_nCount > 1) { |
+ CountedFaceCache* counted_face_cache = it->second; |
+ if (counted_face_cache->m_nCount > 2) { |
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); |
- } |
+ } else { |
+ delete counted_face_cache->m_Obj; |
+ delete counted_face_cache; |
+ map.erase(it); |
} |
} |