diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-25 15:17:46 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-25 15:17:46 -0800 |
| commit | 53cf01e2b67befbe371a4a56af3cf0d23f854009 (patch) | |
| tree | 14ea27d84c06072b8190ba05fb40342bc370761a /core/include | |
| parent | 73463f302da567dcfe94c96a8d7f852f07410414 (diff) | |
| download | pdfium-53cf01e2b67befbe371a4a56af3cf0d23f854009.tar.xz | |
Merge to Master: Remove several more unused parser values.
Review URL: https://codereview.chromium.org/1634683003 .
(cherry picked from commit e24ea22700c9fc534d40cc510d59c453aa9d0ddb)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1632843004 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 14 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 10 |
2 files changed, 2 insertions, 22 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index a12a867062..f0b50f8638 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -207,11 +207,6 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjectHolder { CPDF_DocRenderData* m_pDocRender; }; -#define PDFWORD_EOF 0 -#define PDFWORD_NUMBER 1 -#define PDFWORD_TEXT 2 -#define PDFWORD_DELIMITER 3 -#define PDFWORD_NAME 4 class CPDF_SimpleParser { public: CPDF_SimpleParser(const uint8_t* pData, FX_DWORD dwSize); @@ -239,14 +234,13 @@ class CPDF_SimpleParser { } private: - void ParseWord(const uint8_t*& pStart, FX_DWORD& dwSize, int& type); + void ParseWord(const uint8_t*& pStart, FX_DWORD& dwSize); const uint8_t* m_pData; - FX_DWORD m_dwSize; - FX_DWORD m_dwCurPos; }; + class CPDF_SyntaxParser { public: CPDF_SyntaxParser(); @@ -335,8 +329,6 @@ class CPDF_SyntaxParser { FX_FILESIZE m_Pos; - FX_BOOL m_bFileStream; - int m_MetadataObjnum; IFX_FileRead* m_pFileAccess; @@ -356,8 +348,6 @@ class CPDF_SyntaxParser { uint8_t m_WordBuffer[257]; FX_DWORD m_WordSize; - - FX_FILESIZE m_dwWordPos; }; #define PDFPARSE_ERROR_SUCCESS 0 diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 6c4e6ad447..51bf8f7d65 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -992,16 +992,6 @@ class CFX_ListArrayTemplate { typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>, FX_FILESIZE> CFX_FileSizeListArray; -typedef enum { - Ready, - ToBeContinued, - Found, - NotFound, - Failed, - Done -} FX_ProgressiveStatus; -#define ProgressiveStatus FX_ProgressiveStatus - class CFX_Vector_3by1 { public: CFX_Vector_3by1() : a(0.0f), b(0.0f), c(0.0f) {} |