Merge to Master: Remove several more unused parser values.

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 <map>
@@ skipping 189 matching lines @@
   friend class CPDF_Creator;
   friend class CPDF_Parser;
   friend class CPDF_DataAvail;
   friend class CPDF_OCContext;
 
   CPDF_DocPageData* m_pDocPage;
 
   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);
 
   CPDF_SimpleParser(const CFX_ByteStringC& str);
 
   CFX_ByteStringC GetWord();
 
   FX_BOOL SearchToken(const CFX_ByteStringC& token);
 
   FX_BOOL SkipWord(const CFX_ByteStringC& token);
 
   FX_BOOL FindTagPair(const CFX_ByteStringC& start_token,
                       const CFX_ByteStringC& end_token,
                       FX_DWORD& start_pos,
                       FX_DWORD& end_pos);
 
   FX_BOOL FindTagParam(const CFX_ByteStringC& token, int nParams);
 
   FX_DWORD GetPos() { return m_dwCurPos; }
 
   void SetPos(FX_DWORD pos) {
     ASSERT(pos <= m_dwSize);
     m_dwCurPos = pos;
   }
 
  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();
   virtual ~CPDF_SyntaxParser();
 
   void InitParser(IFX_FileRead* pFileAccess, FX_DWORD HeaderOffset);
 
   FX_FILESIZE SavePos() { return m_Pos; }
 
   void RestorePos(FX_FILESIZE pos) { m_Pos = pos; }
@@ skipping 68 matching lines @@
   CFX_ByteString ReadHexString();
 
   unsigned int ReadEOLMarkers(FX_FILESIZE pos);
 
   CPDF_Stream* ReadStream(CPDF_Dictionary* pDict,
                           FX_DWORD objnum,
                           FX_DWORD gennum);
 
   FX_FILESIZE m_Pos;
 
-  FX_BOOL m_bFileStream;
-
   int m_MetadataObjnum;
 
   IFX_FileRead* m_pFileAccess;
 
   FX_DWORD m_HeaderOffset;
 
   FX_FILESIZE m_FileLen;
 
   uint8_t* m_pFileBuf;
 
   FX_DWORD m_BufSize;
 
   FX_FILESIZE m_BufOffset;
 
   std::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
 
   uint8_t m_WordBuffer[257];
 
   FX_DWORD m_WordSize;
-
-  FX_FILESIZE m_dwWordPos;
 };
 
 #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 {
@@ skipping 610 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_