Merge to XFA: Cache object numbers in CPDF_Parser::ParseIndirectObject().

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>
+
 #include "core/include/fxcrt/fx_system.h"
 #include "fpdf_objects.h"
 #include "public/fpdf_dataavail.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CFDF_Document;
 class CFDF_Parser;
 class CFX_AffineMatrix;
 class CFX_DIBSource;
 class CFX_FloatRect;
@@ skipping 472 matching lines @@
   void ReleaseEncryptHandler();
 
   FX_BOOL LoadLinearizedAllCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount);
 
   FX_BOOL LoadLinearizedCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount);
 
   FX_BOOL LoadLinearizedAllCrossRefV5(FX_FILESIZE pos);
 
   FX_DWORD LoadLinearizedMainXRefTable();
 
-  CFX_MapPtrToPtr m_ObjectStreamMap;
-
   CPDF_StreamAcc* GetObjectStream(FX_DWORD number);
 
   FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset);
 
   bool FindPosInOffsets(FX_FILESIZE pos) const;
 
   int m_FileVersion;
 
   CPDF_Dictionary* m_pTrailer;
 
@@ skipping 23 matching lines @@
   CFX_WordArray m_ObjVersion;
   CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers;
 
   FX_BOOL m_bVersionUpdated;
 
   CPDF_Object* m_pLinearized;
 
   FX_DWORD m_dwFirstPageNo;
 
   FX_DWORD m_dwXrefStartObjNum;
+
+  // A map of object numbers to indirect streams. Map owns the streams.
+  CFX_MapPtrToPtr m_ObjectStreamMap;
+
+  // Mapping of object numbers to offsets. The offsets are relative to the first
+  // object in the stream.
+  using StreamObjectCache = std::map<FX_DWORD, FX_DWORD>;
+
+  // 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;
+
   friend class CPDF_Creator;
   friend class CPDF_DataAvail;
 };
+
 #define FXCIPHER_NONE 0
 #define FXCIPHER_RC4 1
 #define FXCIPHER_AES 2
 #define FXCIPHER_AES2 3
 class CPDF_SecurityHandler {
  public:
   virtual ~CPDF_SecurityHandler() {}
 
   virtual FX_BOOL OnInit(CPDF_Parser* pParser,
                          CPDF_Dictionary* pEncryptDict) = 0;
@@ skipping 408 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_