diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-13 12:14:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-13 12:14:35 -0700 |
| commit | a282c7380f3964de41ea93c9980b12c4513d3473 (patch) | |
| tree | 5202284e527cd2bdcd7bcd22495018c9fbff1fd5 /fpdfsdk/cpdfsdk_formfillenvironment.cpp | |
| parent | f3736bca5f874b0889c5906ffbd74a405089f671 (diff) | |
| download | pdfium-a282c7380f3964de41ea93c9980b12c4513d3473.tar.xz | |
Revert of Reland: Make the CPDFXFA_App non-global (patchset #2 id:20001 of https://codereview.chromium.org/2418653003/ )
Reason for revert:
https://build.chromium.org/p/client.pdfium/builders/linux_xfa_asan_lsan/builds/117/steps/corpus%20tests/logs/stdio
Original issue's description:
> Reland: Make the CPDFXFA_App non-global
>
> This reverts commit b685e6471075bebd26711bc183de3128f54932e3.
>
> This CL changes CPDFXFA_App from a global object to a child of the CPDFXFA_Document objects.
>
> BUG=pdfium:623
>
> Committed: https://pdfium.googlesource.com/pdfium/+/f3736bca5f874b0889c5906ffbd74a405089f671
TBR=tsepez@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=pdfium:623
Review-Url: https://codereview.chromium.org/2414883006
Diffstat (limited to 'fpdfsdk/cpdfsdk_formfillenvironment.cpp')
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index 9ad7c9fd71..71b83b2655 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -58,6 +58,11 @@ CPDFSDK_FormFillEnvironment::~CPDFSDK_FormFillEnvironment() { // Those widgets may call things like KillTimer() as they are shutdown. m_pFormFiller.reset(); +#ifdef PDF_ENABLE_XFA + CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); + if (pProvider->m_pFormFillEnvList.GetSize() == 0) + pProvider->SetJavaScriptInitialized(FALSE); +#endif // PDF_ENABLE_XFA if (m_pInfo && m_pInfo->Release) m_pInfo->Release(m_pInfo); } |