Fix CPDFSDK_FormFillEnvironment destruction order
This was broken in 6c659ab2. Also fix m_PageMap naming while
we're at it to match conventions.
TEST=covered by forthcoming bug 662698 CL.
Review-Url: https://codereview.chromium.org/2489663002
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index 2438019..b7afbbc 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -112,7 +112,7 @@
CPDFXFA_Context* GetXFAContext() const { return m_pUnderlyingDoc; }
void ResetXFADocument() { m_pUnderlyingDoc = nullptr; }
- int GetPageViewCount() const { return m_pageMap.size(); }
+ int GetPageViewCount() const { return m_PageMap.size(); }
void DisplayCaret(FPDF_PAGE page,
FPDF_BOOL bVisible,
@@ -213,7 +213,7 @@
std::unique_ptr<CPDFSDK_ActionHandler> m_pActionHandler;
std::unique_ptr<IJS_Runtime> m_pJSRuntime;
FPDF_FORMFILLINFO* const m_pInfo;
- std::map<UnderlyingPageType*, std::unique_ptr<CPDFSDK_PageView>> m_pageMap;
+ std::map<UnderlyingPageType*, std::unique_ptr<CPDFSDK_PageView>> m_PageMap;
std::unique_ptr<CPDFSDK_InterForm> m_pInterForm;
CPDFSDK_Annot::ObservedPtr m_pFocusAnnot;
UnderlyingDocumentType* m_pUnderlyingDoc;