Merge to XFA: Change CPDF_SyntaxParser::GetNextWord() to not pass by non-const ref.

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 270 matching lines @@
   void SetEncrypt(CPDF_CryptoHandler* pCryptoHandler) {
     m_pCryptoHandler.reset(pCryptoHandler);
   }
 
   FX_BOOL IsEncrypted() { return m_pCryptoHandler != NULL; }
 
   FX_BOOL GetCharAt(FX_FILESIZE pos, uint8_t& ch);
 
   FX_BOOL ReadBlock(uint8_t* pBuf, FX_DWORD size);
 
-  CFX_ByteString GetNextWord(FX_BOOL& bIsNumber);
+  CFX_ByteString GetNextWord(bool* bIsNumber);
 
  protected:
   friend class CPDF_Parser;
   friend class CPDF_DataAvail;
   friend class fpdf_parser_parser_ReadHexString_Test;
 
   static const int kParserMaxRecursionDepth = 64;
   static int s_CurrentRecursionDepth;
 
   virtual FX_BOOL GetNextChar(uint8_t& ch);
 
   FX_BOOL GetCharAtBackward(FX_FILESIZE pos, uint8_t& ch);
 
-  void GetNextWord();
+  void GetNextWordInternal(bool* bIsNumber);
 
   bool IsWholeWord(FX_FILESIZE startpos,
                    FX_FILESIZE limit,
                    const CFX_ByteStringC& tag,
                    FX_BOOL checkKeyword);
 
   CFX_ByteString ReadString();
 
   CFX_ByteString ReadHexString();
 
@@ skipping 21 matching lines @@
   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_BOOL m_bIsNumber;
-
   FX_FILESIZE m_dwWordPos;
 };
 
 #define PDFPARSE_TYPEONLY 1
 #define PDFPARSE_NOSTREAM 2
 struct PARSE_CONTEXT {
   uint32_t m_Flags;
   FX_FILESIZE m_DictStart;
   FX_FILESIZE m_DictEnd;
   FX_FILESIZE m_DataStart;
@@ skipping 618 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_