diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-14 15:06:53 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-14 15:06:53 -0700 |
| commit | f458362c167f29f37301f48b08eb8d916e69d40b (patch) | |
| tree | d1d53eb4e1fddee030d7ccbc05e19c80765260c3 /fpdfsdk/src/javascript/global.cpp | |
| parent | 142165e2f62b8ba727e8aab40591ca3a7b6fa214 (diff) | |
| download | pdfium-f458362c167f29f37301f48b08eb8d916e69d40b.tar.xz | |
Merge to XFA: Get CJS_RuntimeFactory out of CJS_GlobalData management.
(cherry picked from commit 9a817f092e6800e9338b41acf4ea0416b6ad4467)
Original Review URL: https://codereview.chromium.org/1338993005 .
Small manual merge in
fpdfsdk/src/javascript/JS_GlobalData.cpp
fpdfsdk/src/javascript/global.cpp
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1341913002 .
Diffstat (limited to 'fpdfsdk/src/javascript/global.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/global.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index 07709129fe..e87db8c7a0 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -109,13 +109,12 @@ JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject) JSGlobalAlternate::~JSGlobalAlternate() { DestroyGlobalPersisitentVariables(); - CPDFXFA_App::GetInstance()->GetRuntimeFactory()->ReleaseGlobalData(); + m_pGlobalData->Release(); } void JSGlobalAlternate::Initial(CPDFDoc_Environment* pApp) { m_pApp = pApp; - m_pGlobalData = - CPDFXFA_App::GetInstance()->GetRuntimeFactory()->NewGlobalData(pApp); + m_pGlobalData = CJS_GlobalData::GetRetainedInstance(pApp); UpdateGlobalPersistentVariables(); } |