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

Original Review URL: https://codereview.chromium.org/1520643002 .
(cherry picked from commit 7db2a535f163e7ce5995da12161ebd0214f0f75a)

Original Review URL: https://codereview.chromium.org/1511413008 .
(cherry picked from commit 168cfb7ee0f2abbd2bddb7e7d8b430a6d8c6c120)

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1515613006 .

2 files changed, 14 insertions, 21 deletions

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 47876a2280..227a208080 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -34,24 +34,18 @@ CFX_GlyphBitmap* CPDF_Type3Cache::LoadGlyph(FX_DWORD charcode,
   } else {
     pSizeCache = it->second;
   }
-  CFX_GlyphBitmap* pGlyphBitmap;
-  if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)charcode,
-                                    (void*&)pGlyphBitmap)) {
-    return pGlyphBitmap;
-  }
-  pGlyphBitmap =
+  auto it2 = pSizeCache->m_GlyphMap.find(charcode);
+  if (it2 != pSizeCache->m_GlyphMap.end())
+    return it2->second;
+
+  CFX_GlyphBitmap* pGlyphBitmap =
       RenderGlyph(pSizeCache, charcode, pMatrix, retinaScaleX, retinaScaleY);
-  pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)charcode, pGlyphBitmap);
+  pSizeCache->m_GlyphMap[charcode] = pGlyphBitmap;
   return pGlyphBitmap;
 }
 CPDF_Type3Glyphs::~CPDF_Type3Glyphs() {
-  FX_POSITION pos = m_GlyphMap.GetStartPosition();
-  void* Key;
-  CFX_GlyphBitmap* pGlyphBitmap;
-  while (pos) {
-    m_GlyphMap.GetNextAssoc(pos, Key, (void*&)pGlyphBitmap);
-    delete pGlyphBitmap;
-  }
+  for (const auto& pair : m_GlyphMap)
+    delete pair.second;
 }
 static int _AdjustBlue(FX_FLOAT pos, int& count, int blues[]) {
   FX_FLOAT min_distance = 1000000.0f * 1.0f;
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index d173f47b7c..d348b48dfd 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -21,19 +21,18 @@ class CPDF_QuickStretcher;
 
 class CPDF_Type3Glyphs {
  public:
-  CPDF_Type3Glyphs() {
-    m_GlyphMap.InitHashTable(253);
-    m_TopBlueCount = m_BottomBlueCount = 0;
-  }
+  CPDF_Type3Glyphs() : m_TopBlueCount(0), m_BottomBlueCount(0) {}
   ~CPDF_Type3Glyphs();
-  CFX_MapPtrToPtr m_GlyphMap;
   void AdjustBlue(FX_FLOAT top,
                   FX_FLOAT bottom,
                   int& top_line,
                   int& bottom_line);
 
-  int m_TopBlue[TYPE3_MAX_BLUES], m_BottomBlue[TYPE3_MAX_BLUES];
-  int m_TopBlueCount, m_BottomBlueCount;
+  std::map<FX_DWORD, CFX_GlyphBitmap*> m_GlyphMap;
+  int m_TopBlue[TYPE3_MAX_BLUES];
+  int m_BottomBlue[TYPE3_MAX_BLUES];
+  int m_TopBlueCount;
+  int m_BottomBlueCount;
 };
 class CPDF_Type3Cache {
  public: