From 0c8e6c1f39f20985a3efb17292e46c476194183a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 19 Nov 2015 23:12:02 -0800 Subject: Cache object numbers in CPDF_Parser::ParseIndirectObject(). R=jun_fang@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/1458633004 . --- core/include/fpdfapi/fpdf_parser.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'core/include/fpdfapi') diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 174430e440..efb955be21 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -7,6 +7,8 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ +#include + #include "core/include/fxcrt/fx_system.h" #include "fpdf_objects.h" #include "third_party/base/nonstd_unique_ptr.h" @@ -498,8 +500,6 @@ class CPDF_Parser { FX_DWORD LoadLinearizedMainXRefTable(); - CFX_MapPtrToPtr m_ObjectStreamMap; - CPDF_StreamAcc* GetObjectStream(FX_DWORD number); FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset); @@ -543,9 +543,22 @@ class CPDF_Parser { 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; + + // Mapping of streams to their object caches. This is valid as long as the + // streams in |m_ObjectStreamMap| are valid. + std::map m_ObjCache; + friend class CPDF_Creator; friend class CPDF_DataAvail; }; + #define FXCIPHER_NONE 0 #define FXCIPHER_RC4 1 #define FXCIPHER_AES 2 -- cgit v1.2.3