diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-22 08:36:17 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-22 08:36:17 -0700 |
| commit | ed7b2b50aa1744e0bc5a60bef12c61fa91d863b7 (patch) | |
| tree | 8661329f66b823af324441fb6accec98a8753cb8 /fpdfsdk/src/fsdk_mgr.cpp | |
| parent | 854a7f65b70d40225a53890a68a57f5c13cf268c (diff) | |
| download | pdfium-ed7b2b50aa1744e0bc5a60bef12c61fa91d863b7.tar.xz | |
XFA: contention between FXJSE and FXJS over isolate data slots
This probably broke at 06b60021e when the FXJS slot moved to 0
from 1 unless explicitly overriden by the embedder, which conflicted
with the FXJSE_ usage of slot 0.
Also simplify some logic used to track global intialization of the
underling JS.
TEST=run_javascript_tests.py on XFA branch doesn't segv.
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/1351173002 .
Diffstat (limited to 'fpdfsdk/src/fsdk_mgr.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_mgr.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index a3e77e4514..346dacce59 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -222,10 +222,8 @@ CPDFDoc_Environment::~CPDFDoc_Environment() { m_pIFormFiller = NULL; CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); - if (pProvider->m_pEnvList.GetSize() == 0) { - pProvider->ReleaseRuntime(); - pProvider->InitRuntime(TRUE); - } + if (pProvider->m_pEnvList.GetSize() == 0) + pProvider->SetJavaScriptInitialized(FALSE); delete m_pSysHandler; m_pSysHandler = NULL; |