From 39faf4fde606fa3b71d2b6b232cff3e86cb1303f Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 19 May 2016 15:55:11 -0700 Subject: Remove Release() from CPDFDOC_Environment It's never called. But looking at the comments in fpdf_formfill.h for the Release callback, it seems like it should always be called as part of the dtor. BUG= Review-Url: https://codereview.chromium.org/1995753004 --- fpdfsdk/fsdk_mgr.cpp | 2 ++ fpdfsdk/include/fsdk_mgr.h | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp index 3f957c7f3f..e4ceadc43c 100644 --- a/fpdfsdk/fsdk_mgr.cpp +++ b/fpdfsdk/fsdk_mgr.cpp @@ -51,6 +51,8 @@ CPDFDoc_Environment::~CPDFDoc_Environment() { if (pProvider->m_pEnvList.GetSize() == 0) pProvider->SetJavaScriptInitialized(FALSE); #endif // PDF_ENABLE_XFA + if (m_pInfo && m_pInfo->Release) + m_pInfo->Release(m_pInfo); } int CPDFDoc_Environment::JS_appAlert(const FX_WCHAR* Msg, diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index cd89a925ab..ca46a069f1 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -40,14 +40,6 @@ class CPDFDoc_Environment final { CPDFDoc_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo); ~CPDFDoc_Environment(); -#ifdef PDF_ENABLE_XFA - void Release() { - if (m_pInfo && m_pInfo->Release) - m_pInfo->Release(m_pInfo); - delete this; - } -#endif // PDF_ENABLE_XFA - void FFI_Invalidate(FPDF_PAGE page, double left, double top, -- cgit v1.2.3