From 4f34c64914be17966f2d91591921dec635582061 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 2 Jun 2017 00:45:14 -0700 Subject: Clean up CFFL formfiller classes. - Consolidate assertions for m_pFormFillEnv. - Remove check for m_pFormFillEnv being NULL. - Pass in a CPDFSDK_Widget* instead of an Annot* and then casting. - Remove unused LoadPopupMenuString() method. Change-Id: Ic22e75c9e41eb54002be812945a3ee80debeca8b Reviewed-on: https://pdfium-review.googlesource.com/6232 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- fpdfsdk/formfiller/cffl_textfield.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/formfiller/cffl_textfield.cpp') diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 1090f8a251..c34bf3e54e 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -13,8 +13,8 @@ #include "third_party/base/ptr_util.h" CFFL_TextField::CFFL_TextField(CPDFSDK_FormFillEnvironment* pApp, - CPDFSDK_Annot* pAnnot) - : CFFL_FormFiller(pApp, pAnnot) {} + CPDFSDK_Widget* pWidget) + : CFFL_FormFiller(pApp, pWidget) {} CFFL_TextField::~CFFL_TextField() { for (const auto& it : m_Maps) @@ -258,7 +258,6 @@ bool CFFL_TextField::IsFieldFull(CPDFSDK_PageView* pPageView) { #endif // PDF_ENABLE_XFA void CFFL_TextField::OnSetFocus(CPWL_Wnd* pWnd) { - ASSERT(m_pFormFillEnv); if (pWnd->GetClassName() != PWL_CLASSNAME_EDIT) return; -- cgit v1.2.3