Unify some code

core/fpdfapi/parser/cpdf_parser.h

 // Copyright 2016 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_FPDFAPI_PARSER_CPDF_PARSER_H_
 #define CORE_FPDFAPI_PARSER_CPDF_PARSER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
 
 class CPDF_Array;
 class CPDF_CryptoHandler;
 class CPDF_Dictionary;
 class CPDF_Document;
 class CPDF_IndirectObjectHolder;
+class CPDF_Linearized;
 class CPDF_Object;
 class CPDF_SecurityHandler;
 class CPDF_StreamAcc;
 class CPDF_SyntaxParser;
 class IFX_SeekableReadStream;
 
 class CPDF_Parser {
  public:
   enum Error {
     SUCCESS = 0,
@@ skipping 49 matching lines @@
   CPDF_Object* ParseIndirectObjectAt(CPDF_IndirectObjectHolder* pObjList,
                                      FX_FILESIZE pos,
                                      uint32_t objnum);
 
   CPDF_Object* ParseIndirectObjectAtByStrict(
       CPDF_IndirectObjectHolder* pObjList,
       FX_FILESIZE pos,
       uint32_t objnum,
       FX_FILESIZE* pResultPos);
 
-  uint32_t GetFirstPageNo() const { return m_dwFirstPageNo; }
+  uint32_t GetFirstPageNo() const;
 
  protected:
   struct ObjectInfo {
     ObjectInfo() : pos(0), type(0), gennum(0) {}
 
     FX_FILESIZE pos;
     uint8_t type;
     uint16_t gennum;
   };
 
@@ skipping 49 matching lines @@
   int m_FileVersion;
   CPDF_Dictionary* m_pTrailer;
   CPDF_Dictionary* m_pEncryptDict;
   FX_FILESIZE m_LastXRefOffset;
   FX_BOOL m_bXRefStream;
   std::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler;
   CFX_ByteString m_Password;
   std::set<FX_FILESIZE> m_SortedOffset;
   std::vector<CPDF_Dictionary*> m_Trailers;
   bool m_bVersionUpdated;
-  CPDF_Object* m_pLinearized;
-  uint32_t m_dwFirstPageNo;
+  std::unique_ptr<CPDF_Linearized> m_pLinearized;
   uint32_t m_dwXrefStartObjNum;
 
   // A map of object numbers to indirect streams. Map owns the streams.
   std::map<uint32_t, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap;
 
   // Mapping of object numbers to offsets. The offsets are relative to the first
   // object in the stream.
   using StreamObjectCache = std::map<uint32_t, uint32_t>;
 
   // Mapping of streams to their object caches. This is valid as long as the
   // streams in |m_ObjectStreamMap| are valid.
   std::map<CPDF_StreamAcc*, StreamObjectCache> m_ObjCache;
 
   // All indirect object numbers that are being parsed.
   std::set<uint32_t> m_ParsingObjNums;
 };
 
 #endif  // CORE_FPDFAPI_PARSER_CPDF_PARSER_H_