From 69ceb6a9761b3ccb228a2405e9a493a3666e0601 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 21 Oct 2015 15:55:42 -0700 Subject: More master side changes for convergence with XFA. - Add new CPDFSDK_Document::GetPDFDocument() - FPDFDocumentFromCPDFDocument() to match XFA - rename some JS variables to be consistent with XFA - remove unused param from CJS_GlobalData(). - kill dead code used XFA only. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1413883005 . --- fpdfsdk/src/javascript/JS_GlobalData.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_GlobalData.cpp') diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index cf51f9f73d..cf5b997dd2 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -104,7 +104,7 @@ CJS_GlobalData* CJS_GlobalData::g_Instance = nullptr; // static CJS_GlobalData* CJS_GlobalData::GetRetainedInstance(CPDFDoc_Environment* pApp) { if (!g_Instance) { - g_Instance = new CJS_GlobalData(pApp); + g_Instance = new CJS_GlobalData(); } ++g_Instance->m_RefCount; return g_Instance; @@ -117,7 +117,7 @@ void CJS_GlobalData::Release() { } } -CJS_GlobalData::CJS_GlobalData(CPDFDoc_Environment* pApp) : m_RefCount(0) { +CJS_GlobalData::CJS_GlobalData() : m_RefCount(0) { m_sFilePath += SDK_JS_GLOBALDATA_FILENAME; LoadGlobalPersistentVariables(); } -- cgit v1.2.3