diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-21 15:55:42 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-21 15:55:42 -0700 |
| commit | 69ceb6a9761b3ccb228a2405e9a493a3666e0601 (patch) | |
| tree | aeda419b1fc75d5c2d2147b172edd47ae12298ac /fpdfsdk/src/javascript/JS_GlobalData.cpp | |
| parent | 3b2ab45f0a883046a7c457e8435b5a9b2c1c4156 (diff) | |
| download | pdfium-69ceb6a9761b3ccb228a2405e9a493a3666e0601.tar.xz | |
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 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_GlobalData.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_GlobalData.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |