From 741d5e1e0a64b85717ad054d3fd8807c66845a50 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 9 Apr 2018 19:08:25 +0000 Subject: Merge CXFA_FFDoc::{Start|Do|Stop}Load methods The StartLoad, DoLoad and StopLoad methods are called in sequence from the CPDFXFA_Context. This CL merges the three methods into a single Load method. Change-Id: I7135502354fb4c64784c89fa39b74fc58c76b683 Reviewed-on: https://pdfium-review.googlesource.com/29990 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fpdfsdk/fpdfxfa/cpdfxfa_context.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/fpdfxfa/cpdfxfa_context.cpp') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 5553025371..0ba7f31995 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -96,14 +96,13 @@ bool CPDFXFA_Context::LoadXFADoc() { return false; } - m_pXFADoc->StartLoad(); - int iStatus = m_pXFADoc->DoLoad(); + int iStatus = m_pXFADoc->Load(); if (iStatus != XFA_PARSESTATUS_Done) { CloseXFADoc(); SetLastError(FPDF_ERR_XFALOAD); return false; } - m_pXFADoc->StopLoad(); + m_pXFADoc->GetXFADoc()->InitScriptContext(GetCJSRuntime()); if (m_pXFADoc->GetFormType() == FormType::kXFAFull) -- cgit v1.2.3