From 19cd7cc42700b844e6d9fc170a65bf7122d468b8 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Fri, 4 Nov 2016 21:06:05 -0700 Subject: Revert of Unify some code (patchset #14 id:260001 of https://codereview.chromium.org/2466023002/ ) Reason for revert: Breaking the chrome roll. See https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/331856 Original issue's description: > Unify some code > > Move parsing of linearized header into separate CPDF_Linearized class. > > Committed: https://pdfium.googlesource.com/pdfium/+/71333dc57ac7e4cf7963c83333730b3882ab371f TBR=thestig@chromium.org,brucedawson@chromium.org,art-snake@yandex-team.ru # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2474283005 --- core/fpdfapi/parser/cpdf_data_avail.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_data_avail.h') diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h index bff9f2943b..0a8716a498 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.h +++ b/core/fpdfapi/parser/cpdf_data_avail.h @@ -16,7 +16,6 @@ class CPDF_Dictionary; class CPDF_HintTables; class CPDF_IndirectObjectHolder; -class CPDF_Linearized; class CPDF_Parser; enum PDF_DATAAVAIL_STATUS { @@ -200,7 +199,7 @@ class CPDF_DataAvail final { CPDF_Object* m_pRoot; uint32_t m_dwRootObjNum; uint32_t m_dwInfoObjNum; - std::unique_ptr m_pLinearized; + CPDF_Object* m_pLinearized; CPDF_Object* m_pTrailer; bool m_bDocAvail; FX_FILESIZE m_dwHeaderOffset; @@ -221,6 +220,8 @@ class CPDF_DataAvail final { CFX_ArrayTemplate m_XRefStreamList; CFX_ArrayTemplate m_PageObjList; uint32_t m_PagesObjNum; + bool m_bLinearized; + uint32_t m_dwFirstPageNo; bool m_bLinearedDataOK; bool m_bMainXRefLoadTried; bool m_bMainXRefLoadedOK; -- cgit v1.2.3