Refactor CPDF_Document

core/fpdfapi/fpdf_parser/include/cpdf_document.h

Index: core/fpdfapi/fpdf_parser/include/cpdf_document.h
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
index 2d315e9d5beb7c67583c6d1fc0b9f07c66957824..72cd97f53220bfe1bbe59353d71c0ab3d234ffac 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
@@ -48,6 +48,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
   CPDF_Dictionary* GetInfo() const { return m_pInfoDict; }
 
   int GetPageCount() const;
+  CPDF_Dictionary* GetPagesDict() const;

[dsinclair, 2016/09/09 00:21:06]

Put this in the private section?

[npm, 2016/09/09 14:24:15]

Done, but method no longer used in InsertNewPage.

   CPDF_Dictionary* GetPage(int iPage);
   int GetPageIndex(uint32_t objnum);
   uint32_t GetUserPermissions() const;
@@ -60,8 +61,6 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
 
   CPDF_DocRenderData* GetRenderData() const { return m_pDocRender.get(); }
 
-  FX_BOOL IsFormStream(uint32_t objnum, FX_BOOL& bForm) const;

[npm, 2016/09/09 14:24:15]

This slipped from delete CL, should have gone there.

-
   // |pFontDict| must not be null.
   CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict);
   CPDF_ColorSpace* LoadColorSpace(CPDF_Object* pCSObj,
@@ -128,6 +127,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
 
  private:
   void LoadDocInternal();
+  size_t CalculateEncodingDict(int charset, CPDF_Dictionary* pBaseDict);
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_