Merge to XFA: Make m_pStockMap a real map.

core/src/fpdfapi/fpdf_font/font_int.h

 // 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
 
 #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 #include <map>
+#include <memory>
 
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcrt/fx_basic.h"
 
 class CPDF_CID2UnicodeMap;
 class CPDF_CMap;
 class CPDF_Font;
 class CPDF_Stream;
 
 typedef void* FXFT_Library;
@@ skipping 11 matching lines @@
   void ReloadAll();
 
  private:
   CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK);
   CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK);
 
   FX_BOOL m_bPrompted;
   std::map<CFX_ByteString, CPDF_CMap*> m_CMaps;
   CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6];
 };
+
+class CFX_StockFontArray {
+ public:
+  CFX_StockFontArray();
+  ~CFX_StockFontArray();
+
+  // Takes ownership of |pFont|.
+  void SetFont(int index, CPDF_Font* pFont);
+  CPDF_Font* GetFont(int index) const;
+
+ private:
+  std::unique_ptr<CPDF_Font> m_StockFonts[14];
+};
+
 class CPDF_FontGlobals {
  public:
   CPDF_FontGlobals();
   ~CPDF_FontGlobals();
-  void ClearAll();
-  void Clear(void* key);
-  CPDF_Font* Find(void* key, int index);
-  void Set(void* key, int index, CPDF_Font* pFont);
+
+  void Clear(CPDF_Document* pDoc);
+  CPDF_Font* Find(CPDF_Document* pDoc, int index);
+
+  // Takes ownership of |pFont|.
+  void Set(CPDF_Document* key, int index, CPDF_Font* pFont);
+
   CPDF_CMapManager m_CMapManager;
   struct {
     const struct FXCMAP_CMap* m_pMapList;
     int m_Count;
   } m_EmbeddedCharsets[CIDSET_NUM_SETS];
   struct {
     const FX_WORD* m_pMap;
     int m_Count;
   } m_EmbeddedToUnicodes[CIDSET_NUM_SETS];
 
  private:
-  CFX_MapPtrToPtr m_pStockMap;
-  uint8_t* m_pContrastRamps;
+  std::map<CPDF_Document*, std::unique_ptr<CFX_StockFontArray>> m_StockMap;
 };
 
 struct CMap_CodeRange {
   int m_CharSize;
   uint8_t m_Lower[4];
   uint8_t m_Upper[4];
 };
 
 class CPDF_CMapParser {
  public:
@@ skipping 121 matching lines @@
  public:
   CPDF_FontCharMap(CPDF_Font* pFont);
   CPDF_Font* m_pFont;
 };
 
 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
                                 const FX_WORD*& pMap,
                                 FX_DWORD& count);
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_