Merge to XFA: Replace several more CFX_MapPtrToPtr with std::set or std::map

core/src/fxge/ge/fx_ge_text.cpp

 // Copyright 2014 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
 
 #include "core/include/fxge/fx_ge.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "text_int.h"
@@ skipping 1220 matching lines @@
   }
 }
 
 CFX_FaceCache::CFX_FaceCache(FXFT_Face face) : m_Face(face) {}
 
 CFX_FaceCache::~CFX_FaceCache() {
   for (const auto& pair : m_SizeMap) {
     delete pair.second;
   }
   m_SizeMap.clear();
-  FX_POSITION pos = m_PathMap.GetStartPosition();
-  void* key1;
-  CFX_PathData* pPath;
-  while (pos) {
-    m_PathMap.GetNextAssoc(pos, key1, (void*&)pPath);
-    delete pPath;
+  for (const auto& pair : m_PathMap) {
+    delete pair.second;
   }
-  m_PathMap.RemoveAll();
+  m_PathMap.clear();
 }
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
 void CFX_FaceCache::InitPlatform() {}
 #endif
 CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
     CFX_Font* pFont,
     const CFX_Matrix* pMatrix,
     CFX_ByteStringC& FaceGlyphsKey,
     FX_DWORD glyph_index,
     FX_BOOL bFontStyle,
     int dest_width,
     int anti_alias) {
   CFX_SizeGlyphCache* pSizeCache;
   auto it = m_SizeMap.find(FaceGlyphsKey);
   if (it == m_SizeMap.end()) {
     pSizeCache = new CFX_SizeGlyphCache;
     m_SizeMap[FaceGlyphsKey] = pSizeCache;
   } else {
     pSizeCache = it->second;
   }
-  CFX_GlyphBitmap* pGlyphBitmap = NULL;
-  if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)glyph_index,
-                                    (void*&)pGlyphBitmap)) {
-    return pGlyphBitmap;
-  }
-  pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle, pMatrix,
-                             dest_width, anti_alias);
-  if (pGlyphBitmap == NULL) {
-    return NULL;
-  }
-  pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+  auto it2 = pSizeCache->m_GlyphMap.find(glyph_index);
+  if (it2 != pSizeCache->m_GlyphMap.end())
+    return it2->second;
+
+  CFX_GlyphBitmap* pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle,
+                                              pMatrix, dest_width, anti_alias);
+  if (!pGlyphBitmap)
+    return nullptr;
+
+  pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
   return pGlyphBitmap;
 }
 const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
                                                       FX_DWORD glyph_index,
                                                       FX_BOOL bFontStyle,
                                                       const CFX_Matrix* pMatrix,
                                                       int dest_width,
                                                       int anti_alias,
                                                       int& text_flags) {
   if (glyph_index == (FX_DWORD)-1) {
@@ skipping 41 matching lines @@
                            bFontStyle, dest_width, anti_alias);
 #else
   if (text_flags & FXTEXT_NO_NATIVETEXT) {
     return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey, glyph_index,
                              bFontStyle, dest_width, anti_alias);
   }
   CFX_GlyphBitmap* pGlyphBitmap;
   auto it = m_SizeMap.find(FaceGlyphsKey);
   if (it != m_SizeMap.end()) {
     CFX_SizeGlyphCache* pSizeCache = it->second;
-    if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)glyph_index,
-                                      (void*&)pGlyphBitmap)) {
-      return pGlyphBitmap;
-    }
+    auto it2 = pSizeCache->m_GlyphMap.find(glyph_index);
+    if (it2 != pSizeCache->m_GlyphMap.end())
+      return it2->second;
+
     pGlyphBitmap = RenderGlyph_Nativetext(pFont, glyph_index, pMatrix,
                                           dest_width, anti_alias);
     if (pGlyphBitmap) {
-      pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+      pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
       return pGlyphBitmap;
     }
   } else {
     pGlyphBitmap = RenderGlyph_Nativetext(pFont, glyph_index, pMatrix,
                                           dest_width, anti_alias);
     if (pGlyphBitmap) {
       CFX_SizeGlyphCache* pSizeCache = new CFX_SizeGlyphCache;
       m_SizeMap[FaceGlyphsKey] = pSizeCache;
-      pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+      pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
       return pGlyphBitmap;
     }
   }
   if (pFont->GetSubstFont())
     keygen.Generate(9, (int)(pMatrix->a * 10000), (int)(pMatrix->b * 10000),
                     (int)(pMatrix->c * 10000), (int)(pMatrix->d * 10000),
                     dest_width, anti_alias, pFont->GetSubstFont()->m_Weight,
                     pFont->GetSubstFont()->m_ItalicAngle, pFont->IsVertical());
   else
     keygen.Generate(6, (int)(pMatrix->a * 10000), (int)(pMatrix->b * 10000),
                     (int)(pMatrix->c * 10000), (int)(pMatrix->d * 10000),
                     dest_width, anti_alias);
   CFX_ByteStringC FaceGlyphsKey2(keygen.m_Key, keygen.m_KeyLen);
   text_flags |= FXTEXT_NO_NATIVETEXT;
   return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey2, glyph_index,
                            bFontStyle, dest_width, anti_alias);
 #endif
 }
 CFX_SizeGlyphCache::~CFX_SizeGlyphCache() {
-  FX_POSITION pos = m_GlyphMap.GetStartPosition();
-  void* Key;
-  CFX_GlyphBitmap* pGlyphBitmap = NULL;
-  while (pos) {
-    m_GlyphMap.GetNextAssoc(pos, Key, (void*&)pGlyphBitmap);
-    delete pGlyphBitmap;
+  for (const auto& pair : m_GlyphMap) {
+    delete pair.second;
   }
-  m_GlyphMap.RemoveAll();
+  m_GlyphMap.clear();
 }
 #define CONTRAST_RAMP_STEP 1
 void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) {
   FXFT_MM_Var pMasters = NULL;
   FXFT_Get_MM_Var(m_Face, &pMasters);
   if (pMasters == NULL) {
     return;
   }
   long coords[2];
   if (weight == 0) {
@@ skipping 250 matching lines @@
                       dest_pitch);
       _GammaAdjust(pDestBuf, bmwidth, bmheight, dest_pitch,
                    CFX_GEModule::Get()->GetTextGammaTable());
     }
   }
   return pGlyphBitmap;
 }
 const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont,
                                                  FX_DWORD glyph_index,
                                                  int dest_width) {
-  if (m_Face == NULL || glyph_index == (FX_DWORD)-1) {
-    return NULL;
+  if (!m_Face || glyph_index == (FX_DWORD)-1)
+    return nullptr;
+
+  FX_DWORD key = glyph_index;
+  if (pFont->GetSubstFont()) {
+    key += (((pFont->GetSubstFont()->m_Weight / 16) << 15) +
+            ((pFont->GetSubstFont()->m_ItalicAngle / 2) << 21) +
+            ((dest_width / 16) << 25) + (pFont->IsVertical() << 31));
   }
-  CFX_PathData* pGlyphPath = NULL;
-  void* key;
-  if (pFont->GetSubstFont()) {
-    key = (void*)(uintptr_t)(
-        glyph_index + ((pFont->GetSubstFont()->m_Weight / 16) << 15) +
-        ((pFont->GetSubstFont()->m_ItalicAngle / 2) << 21) +
-        ((dest_width / 16) << 25) + (pFont->IsVertical() << 31));
-  } else {
-    key = (void*)(uintptr_t)glyph_index;
-  }
-  if (m_PathMap.Lookup(key, (void*&)pGlyphPath)) {
-    return pGlyphPath;
-  }
-  pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width);
-  m_PathMap.SetAt(key, pGlyphPath);
+  auto it = m_PathMap.find(key);
+  if (it != m_PathMap.end())
+    return it->second;
+
+  CFX_PathData* pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width);
+  m_PathMap[key] = pGlyphPath;
   return pGlyphPath;
 }
 typedef struct {
   FX_BOOL m_bCount;
   int m_PointCount;
   FX_PATHPOINT* m_pPoints;
   int m_CurX;
   int m_CurY;
   FX_FLOAT m_CoordUnit;
 } OUTLINE_PARAMS;
@@ skipping 189 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((FX_DWORD*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(FX_DWORD);
 }