Cleanup CPDFXFA and CPDF document methods

fpdfsdk/fpdfxfa/include/fpdfxfa_doc.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 FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_
 #define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_
 
 #include <memory>
@@ skipping 20 matching lines @@
 class CPDFXFA_Document {
  public:
   CPDFXFA_Document(std::unique_ptr<CPDF_Document> pPDFDoc,
                    CPDFXFA_App* pProvider);
   ~CPDFXFA_Document();
 
   FX_BOOL LoadXFADoc();
   CPDF_Document* GetPDFDoc() { return m_pPDFDoc.get(); }
   CXFA_FFDoc* GetXFADoc() { return m_pXFADoc.get(); }
   CXFA_FFDocView* GetXFADocView() { return m_pXFADocView; }
-
-  int GetPageCount();
-  CPDFXFA_Page* GetPage(int page_index);
-  CPDFXFA_Page* GetPage(CXFA_FFPageView* pPage);
+  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
+  int GetDocType() { return m_iDocType; }

[Tom Sepez, 2016/09/20 18:52:29]

nit: both of these are const?

[dsinclair, 2016/09/20 19:02:54]

GetSDKDocument can't be const as it may create the SDKDocument.

 
   void DeletePage(int page_index);
+  int GetPageCount() const;
+
+  CPDFXFA_Page* GetXFAPage(int page_index);

[npm, 2016/09/20 14:30:25]

Why separate these?

[dsinclair, 2016/09/20 14:38:09]

Attempting to separate them from the methods that were going to be virtualized.

+  CPDFXFA_Page* GetXFAPage(CXFA_FFPageView* pPage);

[dsinclair, 2016/09/20 18:04:43]

Tom, I renamed these because there is a CPDF_Dictionary* GetPage(int page_index)
in CPDF_Document and, I believe, we can't overload on the return type, yea?

[Tom Sepez, 2016/09/20 18:52:29]

nit: these two too.

[dsinclair, 2016/09/20 19:02:53]

One of these can be, the other can't. The int version may create the page before
returning it. The non-int version just returns pages.

+
   void RemovePage(CPDFXFA_Page* page);
-  int GetDocType() { return m_iDocType; }
-
-  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
 
   void ClearChangeMark();
 
  protected:
   friend class CPDFXFA_DocEnvironment;
 
   CPDFSDK_Document* GetSDKDoc() { return m_pSDKDoc.get(); }
   int GetOriginalPageCount() const { return m_nPageCount; }
   void SetOriginalPageCount(int count) {
     m_nPageCount = count;
@@ skipping 24 matching lines @@
   CPDFXFA_App* const m_pApp;
   CFX_ArrayTemplate<CPDFXFA_Page*> m_XFAPageList;
   LoadStatus m_nLoadStatus;
   int m_nPageCount;
 
   // Must be destroy before |m_pSDKDoc|.
   CPDFXFA_DocEnvironment m_DocEnv;
 };
 
 #endif  // FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_DOC_H_