From 7b094f81483240f50dfc12e51cf545a8f0d5933d Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Tue, 8 May 2018 20:32:08 +0000 Subject: Revert "Ensure that XFA Pages always have a corresponding PDF page" This reverts commit e7207f33f8024b59fc85abb1b4594b0fbab5361b. Reason for revert: Causes crash in some XFA forms - crbug.com/840922 This is a merge, not a clean revert. Original change's description: > Ensure that XFA Pages always have a corresponding PDF page > > The PDF page may be blank, un-numbered, or untracked by CPDF, but > this provides a place for all XFA pages to "extend" from down the > road. > > Change-Id: If1003be0f261154e61e9793ccba7e1f43cd73104 > Reviewed-on: https://pdfium-review.googlesource.com/31771 > Commit-Queue: Tom Sepez > Reviewed-by: dsinclair Change-Id: Ia7f286321552b225a95f461aa8a6aef979f5c991 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:840922 Reviewed-on: https://pdfium-review.googlesource.com/32210 Reviewed-by: dsinclair Commit-Queue: Henrique Nakashima --- fpdfsdk/fpdfxfa/cpdfxfa_page.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fpdfsdk/fpdfxfa/cpdfxfa_page.h') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h index faacf3e0b0..4f4d6b0a22 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h @@ -27,6 +27,7 @@ class CPDFXFA_Page : public CPDF_Page::Extension { friend RetainPtr pdfium::MakeRetain(Args&&... args); bool LoadPage(); + bool LoadPDFPage(CPDF_Dictionary* pageDict); // CPDF_Page::Extension: CPDF_Document::Extension* GetDocumentExtension() const override; @@ -56,6 +57,7 @@ class CPDFXFA_Page : public CPDF_Page::Extension { CPDFXFA_Page(CPDFXFA_Context* pContext, int page_index); ~CPDFXFA_Page() override; + bool LoadPDFPage(); bool LoadXFAPageView(); private: -- cgit v1.2.3