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/fpdfformfill.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/fpdfformfill.cpp')
| -rw-r--r-- | fpdfsdk/fpdfformfill.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 0f44b1dfa2..34e206d6bc 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -258,6 +258,7 @@ FPDFDOC_InitFormFillEnvironment(FPDF_DOCUMENT document, #ifdef PDF_ENABLE_XFA pDocument->SetFormFillEnv(pFormFillEnv); + CPDFXFA_App::GetInstance()->AddFormFillEnv(pFormFillEnv); #endif // PDF_ENABLE_XFA return pFormFillEnv; @@ -272,6 +273,8 @@ FPDFDOC_ExitFormFillEnvironment(FPDF_FORMHANDLE hHandle) { HandleToCPDFSDKEnvironment(hHandle); #ifdef PDF_ENABLE_XFA + CPDFXFA_App::GetInstance()->RemoveFormFillEnv(pFormFillEnv); + // Reset the focused annotations and remove the SDK document from the // XFA document. pFormFillEnv->ClearAllFocusedAnnots(); |