Merge to XFA: kill IPDF_DocParser().

core/include/fpdfapi/fpdf_parser.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_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include "../fxcrt/fx_ext.h"
 #include "fpdf_objects.h"
 
 class CPDF_Document;
-class IPDF_DocParser;
 class CPDF_Parser;
 class CPDF_SecurityHandler;
 class CPDF_StandardSecurityHandler;
 class CPDF_CryptoHandler;
 class CPDF_Object;
 class IFX_FileRead;
 class CFDF_Document;
 class CFDF_Parser;
 class CFX_Font;
 class CFX_AffineMatrix;
@@ skipping 29 matching lines @@
 
 class IPDF_EnumPageHandler
 {
 public:
     virtual ~IPDF_EnumPageHandler() { }
     virtual FX_BOOL EnumPage(CPDF_Dictionary* pPageDict) = 0;
 };
 class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjects
 {
 public:
-
-    CPDF_Document(IPDF_DocParser* pParser);
-
     CPDF_Document();
+    explicit CPDF_Document(CPDF_Parser* pParser);
 
     ~CPDF_Document();
 
-    IPDF_DocParser*                     GetParser() const
+    CPDF_Parser*                        GetParser() const
     {
         return m_pParser;
     }
 
     CPDF_Dictionary*            GetRoot() const
     {
         return m_pRootDict;
     }
 
     CPDF_Dictionary*            GetInfo() const
@@ skipping 281 matching lines @@
     FX_BOOL             m_Flags;
 
     FX_FILESIZE m_DictStart;
 
     FX_FILESIZE m_DictEnd;
 
     FX_FILESIZE m_DataStart;
 
     FX_FILESIZE m_DataEnd;
 };
-class IPDF_DocParser 
-{
-public:
-    virtual ~IPDF_DocParser() { }
-    virtual FX_DWORD    GetRootObjNum() = 0;
-
-    virtual FX_DWORD    GetInfoObjNum() = 0;
-
-    virtual CPDF_Object*        ParseIndirectObject(CPDF_IndirectObjects* pObjList, FX_DWORD objnum, PARSE_CONTEXT* pContext = NULL) = 0;
-
-    virtual FX_DWORD    GetLastObjNum() = 0;
-
-    virtual CPDF_Array* GetIDArray() = 0;
-
-    virtual CPDF_Dictionary*    GetEncryptDict() = 0;
-
-    FX_BOOL                             IsEncrypted()
-    {
-        return GetEncryptDict() != NULL;
-    }
-
-    virtual FX_DWORD    GetPermissions(FX_BOOL bCheckRevision = FALSE) = 0;
-
-    virtual FX_BOOL             IsOwner() = 0;
-
-    virtual FX_BOOL             IsFormStream(FX_DWORD objnum, FX_BOOL& bForm) = 0;
-};
 
 #define PDFPARSE_ERROR_SUCCESS          0
 #define PDFPARSE_ERROR_FILE                     1
 #define PDFPARSE_ERROR_FORMAT           2
 #define PDFPARSE_ERROR_PASSWORD         3
 #define PDFPARSE_ERROR_HANDLER          4
 #define PDFPARSE_ERROR_CERT                     5
-class CPDF_Parser FX_FINAL : public IPDF_DocParser
+
+class CPDF_Parser
 {
 public:
-
     CPDF_Parser();
-    ~CPDF_Parser() override;
+    ~CPDF_Parser();
 
     FX_DWORD                    StartParse(FX_LPCSTR filename, FX_BOOL bReParse = FALSE);
-
     FX_DWORD                    StartParse(FX_LPCWSTR filename, FX_BOOL bReParse = FALSE);
-
     FX_DWORD                    StartParse(IFX_FileRead* pFile, FX_BOOL bReParse = FALSE, FX_BOOL bOwnFileRead = TRUE);
 
     void                                CloseParser(FX_BOOL bReParse = FALSE);
 
-    virtual FX_DWORD    GetPermissions(FX_BOOL bCheckRevision = FALSE) FX_OVERRIDE;
+    FX_DWORD    GetPermissions(FX_BOOL bCheckRevision = FALSE);
 
-    virtual FX_BOOL             IsOwner() FX_OVERRIDE;
+    FX_BOOL             IsOwner();
 
     void                                SetPassword(const FX_CHAR* password)
     {
         m_Password = password;
     }
 
     CFX_ByteString              GetPassword()
     {
         return m_Password;
     }
@@ skipping 22 matching lines @@
 
     FX_FILESIZE                 GetLastXRefOffset()
     {
         return m_LastXRefOffset;
     }
 
     CPDF_Document*              GetDocument()
     {
         return m_pDocument;
     }
-    CFX_ArrayTemplate<CPDF_Dictionary *> * GetOtherTrailers()
+
+    CFX_ArrayTemplate<CPDF_Dictionary*>* GetOtherTrailers()
     {
         return &m_Trailers;
     }
 
-    virtual FX_DWORD    GetRootObjNum() FX_OVERRIDE;
-    virtual FX_DWORD    GetInfoObjNum()  FX_OVERRIDE;
-    virtual CPDF_Array* GetIDArray()  FX_OVERRIDE;
-    virtual CPDF_Dictionary*    GetEncryptDict()  FX_OVERRIDE
+    FX_DWORD    GetRootObjNum();
+    FX_DWORD    GetInfoObjNum() ;
+    CPDF_Array* GetIDArray() ;
+
+    CPDF_Dictionary*    GetEncryptDict() 
     {
         return m_pEncryptDict;
     }
-    virtual CPDF_Object*                ParseIndirectObject(CPDF_IndirectObjects* pObjList, FX_DWORD objnum, PARSE_CONTEXT* pContext = NULL)  FX_OVERRIDE;
-    virtual FX_DWORD    GetLastObjNum() FX_OVERRIDE;
-    virtual FX_BOOL             IsFormStream(FX_DWORD objnum, FX_BOOL& bForm)  FX_OVERRIDE;
+
+    FX_BOOL                             IsEncrypted()
+    {
+        return GetEncryptDict() != NULL;
+    }
+
+
+    CPDF_Object*                ParseIndirectObject(CPDF_IndirectObjects* pObjList, FX_DWORD objnum, PARSE_CONTEXT* pContext = NULL) ;
+    FX_DWORD                    GetLastObjNum();
+    FX_BOOL                             IsFormStream(FX_DWORD objnum, FX_BOOL& bForm);
 
     FX_FILESIZE                 GetObjectOffset(FX_DWORD objnum);
 
     FX_FILESIZE                 GetObjectSize(FX_DWORD objnum);
 
     int                                 GetObjectVersion(FX_DWORD objnum)
     {
         return m_ObjVersion[objnum];
     }
 
@@ skipping 448 matching lines @@
     PDF_DATAAVAIL_PAGE,
     PDF_DATAAVAIL_PAGE_LATERLOAD,
     PDF_DATAAVAIL_RESOURCES,
     PDF_DATAAVAIL_DONE,
     PDF_DATAAVAIL_ERROR,
     PDF_DATAAVAIL_LOADALLFILE,
     PDF_DATAAVAIL_TRAILER_APPEND
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_