diff options
author | tsepez <tsepez@chromium.org> | 2016-11-08 14:38:59 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-08 14:38:59 -0800 |
commit | 2599ff7ae76a2e7514c1794281ccb0802d6df2bc (patch) | |
tree | 07ec8f1ec3fd3c7bbc2f26e951f92f5d6c46163c /fpdfsdk/cpdfsdk_formfillenvironment.h | |
parent | 62114cf3d85ee9149b270e02935c98395567f45e (diff) | |
download | pdfium-2599ff7ae76a2e7514c1794281ccb0802d6df2bc.tar.xz |
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
Diffstat (limited to 'fpdfsdk/cpdfsdk_formfillenvironment.h')
-rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index 2438019707..b7afbbc489 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -112,7 +112,7 @@ class CPDFSDK_FormFillEnvironment 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 @@ class CPDFSDK_FormFillEnvironment 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; |