Split core/include/fpdfdoc/fpdf_ap.h

core/fpdfdoc/cpvt_fontmap.h

Index: core/fpdfdoc/cpvt_fontmap.h
diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h
new file mode 100644
index 0000000000000000000000000000000000000000..40aedb61501283e8796abc3279664ac66e3f1a8a
--- /dev/null
+++ b/core/fpdfdoc/cpvt_fontmap.h
@@ -0,0 +1,45 @@
+// Copyright 2016 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_FPDFDOC_CPVT_FONTMAP_H_
+#define CORE_FPDFDOC_CPVT_FONTMAP_H_
+
+#include <stdint.h>
+
+#include "core/fpdfdoc/ipvt_fontmap.h"
+#include "core/fxcrt/include/fx_string.h"
+
+class CPDF_Document;
+class CPDF_Dictionary;
+class CPDF_Font;
+
+class CPVT_FontMap : public IPVT_FontMap {
+ public:
+  CPVT_FontMap(CPDF_Document* pDoc,
+               CPDF_Dictionary* pResDict,
+               CPDF_Font* pDefFont,
+               const CFX_ByteString& sDefFontAlias);
+  ~CPVT_FontMap() override;
+
+  // IPVT_FontMap:
+  CPDF_Font* GetPDFFont(int32_t nFontIndex) override;
+  CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) override;
+
+  static void GetAnnotSysPDFFont(CPDF_Document* pDoc,
+                                 const CPDF_Dictionary* pResDict,
+                                 CPDF_Font*& pSysFont,
+                                 CFX_ByteString& sSysFontAlias);
+
+ private:
+  CPDF_Document* m_pDocument;
+  const CPDF_Dictionary* m_pResDict;

[Tom Sepez, 2016/03/30 20:11:52]

Actually, I mean CPDF_Dictionary* const m_pResDict and such, indicating that the
dictionary must outlive the CPVT_FontMap

[dsinclair, 2016/03/31 13:43:12]

Done.

+  CPDF_Font* m_pDefFont;
+  const CFX_ByteString m_sDefFontAlias;
+  CPDF_Font* m_pSysFont;
+  CFX_ByteString m_sSysFontAlias;
+};
+
+#endif  // CORE_FPDFDOC_CPVT_FONTMAP_H_