From 240dec52b2e6502e7deb27a3535af3b1a3e23428 Mon Sep 17 00:00:00 2001 From: art-snake Date: Mon, 7 Nov 2016 08:42:04 -0800 Subject: Reland of Unify some code Unify some code Move parsing of linearized header into separate CPDF_Linearized class. Original review: https://codereview.chromium.org/2466023002/ Revert review: https://codereview.chromium.org/2474283005/ Revert reason was: Breaking the chrome roll. See https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/331856 ___ Added Fix for fuzzers. Review-Url: https://codereview.chromium.org/2477213003 --- core/fpdfapi/parser/cpdf_hint_tables.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_hint_tables.h') diff --git a/core/fpdfapi/parser/cpdf_hint_tables.h b/core/fpdfapi/parser/cpdf_hint_tables.h index 84f48cf41f..68b5059b05 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.h +++ b/core/fpdfapi/parser/cpdf_hint_tables.h @@ -14,12 +14,12 @@ #include "core/fxcrt/fx_stream.h" class CFX_BitStream; -class CPDF_Dictionary; +class CPDF_Linearized; class CPDF_Stream; class CPDF_HintTables { public: - CPDF_HintTables(CPDF_DataAvail* pDataAvail, CPDF_Dictionary* pLinearized); + CPDF_HintTables(CPDF_DataAvail* pDataAvail, CPDF_Linearized* pLinearized); virtual ~CPDF_HintTables(); bool GetPagePos(uint32_t index, @@ -46,9 +46,6 @@ class CPDF_HintTables { virtual int ReadPrimaryHintStreamOffset() const; virtual int ReadPrimaryHintStreamLength() const; - // Helper for the ReadPrimaryHintStream methods above. - int ReadPrimaryHintStream(int index) const; - uint32_t GetItemLength(uint32_t index, const std::vector& szArray); @@ -56,7 +53,7 @@ class CPDF_HintTables { CPDF_DataAvail* const m_pDataAvail; // Owned by |m_pDataAvail|. - CPDF_Dictionary* const m_pLinearizedDict; + CPDF_Linearized* const m_pLinearized; uint32_t m_nFirstPageSharedObjs; FX_FILESIZE m_szFirstPageObjOffset; -- cgit v1.2.3