diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-10-02 21:23:50 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-02 21:23:50 +0000 |
| commit | 04c2dbb1908006830b6ee45ea85f6cde1a9fc4cb (patch) | |
| tree | 9e8cbf4cf55887dbfe7e8a634bc69a5b07c8cc2a | |
| parent | 7f47c50227fb4af93b58c6687786130c42b76333 (diff) | |
| download | pdfium-04c2dbb1908006830b6ee45ea85f6cde1a9fc4cb.tar.xz | |
Remove ability to delete annot in CJS_Document::removeField()
This path has only been present under XFA, and has resulted in
several bugs, including the referenced one. There is a breakage in some
XFA functionality, but I'm not confident we can do this without
re-engineering all of fpdfsdk widget ownership.
Bug: 891210
Change-Id: I5aa158fa5359b1c8338046eefb25fb25df9ace48
Reviewed-on: https://pdfium-review.googlesource.com/c/43311
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
4 files changed, 2 insertions, 9 deletions
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp index c839e9f487..35bb240671 100644 --- a/fxjs/cjs_document.cpp +++ b/fxjs/cjs_document.cpp @@ -440,15 +440,10 @@ CJS_Result CJS_Document::removeField( // do not create one. We may be in the process of tearing down the document // and creating a new pageview at this point will cause bad things. CPDFSDK_PageView* pPageView = m_pFormFillEnv->GetPageView(pPage, false); - if (pPageView) { -#ifdef PDF_ENABLE_XFA - pPageView->DeleteAnnot(pWidget); -#endif // PDF_ENABLE_XFA + if (pPageView) pPageView->UpdateRects(aRefresh); - } } m_pFormFillEnv->SetChangeMark(); - return CJS_Result::Success(); } diff --git a/testing/resources/javascript/bug_679642_expected.txt b/testing/resources/javascript/bug_679642_expected.txt index 9e99cc6883..b576eaeced 100644 --- a/testing/resources/javascript/bug_679642_expected.txt +++ b/testing/resources/javascript/bug_679642_expected.txt @@ -1,3 +1,2 @@ Alert: Starting ... Alert: Firing ... -Alert: failed: Field.page: Object no longer exists. diff --git a/testing/resources/javascript/bug_679643_expected.txt b/testing/resources/javascript/bug_679643_expected.txt index 36d4a31344..b576eaeced 100644 --- a/testing/resources/javascript/bug_679643_expected.txt +++ b/testing/resources/javascript/bug_679643_expected.txt @@ -1,3 +1,2 @@ Alert: Starting ... Alert: Firing ... -Alert: failed: Annot.name: Object no longer exists. diff --git a/testing/resources/javascript/xfa_specific/resolve_nodes_1_expected.txt b/testing/resources/javascript/xfa_specific/resolve_nodes_1_expected.txt index d4cc4424d3..335a4e2876 100644 --- a/testing/resources/javascript/xfa_specific/resolve_nodes_1_expected.txt +++ b/testing/resources/javascript/xfa_specific/resolve_nodes_1_expected.txt @@ -1 +1 @@ -: \Find 1 items +: Find 12 items |