From 207299b5d46e3e0612dd6a0264fb7647177312bb Mon Sep 17 00:00:00 2001 From: John Abd-El-Malek Date: Mon, 15 Dec 2014 12:13:45 -0800 Subject: XFA: merge patch from issue 801913002 and 804463003 Simplify PDFium by removing code that's not used in the open source repo. -remove parameter from FPDF_InitLibrary -remove a bunch of ifdefs that are unused Fix build after previous commit. TBR=tsepez@chromium.org BUG= Review URL: https://codereview.chromium.org/809513002 --- core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'core/src/fpdfapi/fpdf_parser') diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index e0cb8277d7..a57771742a 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -1681,11 +1681,7 @@ CPDF_SyntaxParser::CPDF_SyntaxParser() m_pFileBuf = NULL; m_MetadataObjnum = 0; m_dwWordPos = 0; -#if defined(_FPDFAPI_MINI_) - m_bFileStream = TRUE; -#else m_bFileStream = FALSE; -#endif } CPDF_SyntaxParser::~CPDF_SyntaxParser() { @@ -2473,10 +2469,6 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, PARSE_CONTEXT m_Pos = StreamStartPos; } CPDF_Stream* pStream; -#if defined(_FPDFAPI_MINI_) && !defined(_FXCORE_FEATURE_ALL_) - pStream = FX_NEW CPDF_Stream(m_pFileAccess, pCryptoHandler, m_HeaderOffset + m_Pos, len, pDict, gennum); - m_Pos += len; -#else FX_LPBYTE pData = FX_Alloc(FX_BYTE, len); if (!pData) { return NULL; @@ -2494,7 +2486,6 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, PARSE_CONTEXT dest_buf.DetachBuffer(); } pStream = FX_NEW CPDF_Stream(pData, len, pDict); -#endif if (pContext) { pContext->m_DataEnd = pContext->m_DataStart + len; } -- cgit v1.2.3