From df93cd35530e7b8dd67abde8d199c36c3fae76be Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 May 2018 22:58:39 +0000 Subject: Replace some #ifdef PDF_ENABLE_XFA with runtime checks. Abstract GetUserPermissions() differences via new virtual method. Abstract GetPageCount() differences via existing virtual method. Remove unused ReadHeader() form for non-xfa. Remove unused FindSubstFontByUnicode() for xfa. Remove unused FXFONT_EXACTMATCH Change-Id: I0a3de01a9841db86fcbc96991d3fa2682393b9ad Reviewed-on: https://pdfium-review.googlesource.com/32831 Commit-Queue: Tom Sepez Reviewed-by: dsinclair Reviewed-by: Lei Zhang --- core/fpdfapi/parser/cpdf_document.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_document.cpp') diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp index 5479a06174..7968d1b019 100644 --- a/core/fpdfapi/parser/cpdf_document.cpp +++ b/core/fpdfapi/parser/cpdf_document.cpp @@ -464,15 +464,10 @@ int CPDF_Document::RetrievePageCount() { } uint32_t CPDF_Document::GetUserPermissions() const { - // https://bugs.chromium.org/p/pdfium/issues/detail?id=499 - if (!m_pParser) { -#ifndef PDF_ENABLE_XFA - return 0; -#else // PDF_ENABLE_XFA - return 0xFFFFFFFF; -#endif - } - return m_pParser->GetPermissions(); + if (m_pParser) + return m_pParser->GetPermissions(); + + return m_pExtension ? m_pExtension->GetUserPermissions() : 0; } CPDF_Font* CPDF_Document::LoadFont(CPDF_Dictionary* pFontDict) { -- cgit v1.2.3