From a7ff4dc7c27c7940daec9cf740f4b7e7638a45ec Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 14 May 2018 20:13:40 +0000 Subject: Cleanup CPDF_Form parsing code This CL folds the StartParse() method of CPDF_Form into the ParserContent method. The no arguments ParseContent is removed and ParseContentWithParams renamed to ParseContent. The callsites are updated to pass the nullptr's. Bug: chromium:813349 Change-Id: I304b77aef1de1b9aa20e4a3044db5023f5701584 Reviewed-on: https://pdfium-review.googlesource.com/32511 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- core/fpdfapi/page/cpdf_form.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'core/fpdfapi/page/cpdf_form.cpp') diff --git a/core/fpdfapi/page/cpdf_form.cpp b/core/fpdfapi/page/cpdf_form.cpp index 3abeff4829..a63d3ce96d 100644 --- a/core/fpdfapi/page/cpdf_form.cpp +++ b/core/fpdfapi/page/cpdf_form.cpp @@ -29,12 +29,12 @@ CPDF_Form::CPDF_Form(CPDF_Document* pDoc, LoadTransInfo(); } -CPDF_Form::~CPDF_Form() {} +CPDF_Form::~CPDF_Form() = default; -void CPDF_Form::StartParse(CPDF_AllStates* pGraphicStates, - const CFX_Matrix* pParentMatrix, - CPDF_Type3Char* pType3Char, - std::set* parsedSet) { +void CPDF_Form::ParseContent(CPDF_AllStates* pGraphicStates, + const CFX_Matrix* pParentMatrix, + CPDF_Type3Char* pType3Char, + std::set* parsedSet) { if (m_ParseState == CONTENT_PARSED || m_ParseState == CONTENT_PARSING) return; @@ -47,16 +47,6 @@ void CPDF_Form::StartParse(CPDF_AllStates* pGraphicStates, m_pParser = pdfium::MakeUnique( this, pGraphicStates, pParentMatrix, pType3Char, parsedSet); m_ParseState = CONTENT_PARSING; -} - -void CPDF_Form::ParseContent() { - ParseContentWithParams(nullptr, nullptr, nullptr, nullptr); -} -void CPDF_Form::ParseContentWithParams(CPDF_AllStates* pGraphicStates, - const CFX_Matrix* pParentMatrix, - CPDF_Type3Char* pType3Char, - std::set* parsedSet) { - StartParse(pGraphicStates, pParentMatrix, pType3Char, parsedSet); ContinueParse(nullptr); } -- cgit v1.2.3