diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-02 14:19:00 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-02 14:19:00 -0700 |
commit | e06b686620286dfe604693e12e70a4077625eae5 (patch) | |
tree | d4709798ec750ef98b0ac400182d5924c8929bef /core/include/fpdfapi/fpdf_objects.h | |
parent | 4ff7a4246c81a71b4f878e959b3ca304cd76ec8a (diff) | |
download | pdfium-e06b686620286dfe604693e12e70a4077625eae5.tar.xz |
kill IPDF_DocParser().
Its fine to program to interfaces, but since the sole concrete implementation
is in the same header as the interface, the code is bypassing it anyways. We
can de-virtualize some things along the way, and remove two non-existent
function prototypes from one of the headers.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1158053003
Diffstat (limited to 'core/include/fpdfapi/fpdf_objects.h')
-rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 69f344cf9c..0ad641a1e4 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -9,21 +9,22 @@ #include "../fxcrt/fx_ext.h" +class CPDF_Array; +class CPDF_Boolean; +class CPDF_CryptoHandler; +class CPDF_Dictionary; class CPDF_Document; class CPDF_IndirectObjects; class CPDF_Null; -class CPDF_Boolean; class CPDF_Number; -class CPDF_String; +class CPDF_Parser; +class CPDF_Reference; class CPDF_Stream; class CPDF_StreamAcc; class CPDF_StreamFilter; -class CPDF_Array; -class CPDF_Dictionary; -class CPDF_Reference; -class IPDF_DocParser; +class CPDF_String; class IFX_FileRead; -class CPDF_CryptoHandler; + #define PDFOBJ_INVALID 0 #define PDFOBJ_BOOLEAN 1 #define PDFOBJ_NUMBER 2 @@ -34,6 +35,7 @@ class CPDF_CryptoHandler; #define PDFOBJ_STREAM 7 #define PDFOBJ_NULL 8 #define PDFOBJ_REFERENCE 9 + typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, FX_LPVOID pUserData); class CPDF_Object { @@ -709,7 +711,7 @@ class CPDF_IndirectObjects { public: - CPDF_IndirectObjects(IPDF_DocParser* pParser); + CPDF_IndirectObjects(CPDF_Parser* pParser); ~CPDF_IndirectObjects(); @@ -738,7 +740,7 @@ protected: CFX_MapPtrToPtr m_IndirectObjs; - IPDF_DocParser* m_pParser; + CPDF_Parser* m_pParser; FX_DWORD m_LastObjNum; }; |