commit 8779fa8578cf3336ddd4473f833900aba2e595fb
author dsinclair <dsinclair@chromium.org> Wed Oct 12 12:05:44 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 12 12:05:44 2016 -0700
tree df330933cab06ed2c6a6b5b825680fd2b4731d57
parent 7cbe68e34257b460bfa3baf0ea68fd6d50e1bc77

Cleanup env variable names

This CL cleans up any old m_pEnv variables to
be correctly named m_pFormFillEnv.

Review-Url: https://codereview.chromium.org/2412523002

fpdfsdk/cpdfsdk_annothandlermgr.cpp

diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 5324c3f..098bf3d 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -24,14 +24,14 @@
 #endif  // PDF_ENABLE_XFA
 
 CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(
-    CPDFSDK_FormFillEnvironment* pEnv)
+    CPDFSDK_FormFillEnvironment* pFormFillEnv)
     : m_pBAAnnotHandler(new CPDFSDK_BAAnnotHandler()),
-      m_pWidgetHandler(new CPDFSDK_WidgetHandler(pEnv)),
+      m_pWidgetHandler(new CPDFSDK_WidgetHandler(pFormFillEnv)),
 #ifdef PDF_ENABLE_XFA
-      m_pXFAWidgetHandler(new CPDFSDK_XFAWidgetHandler(pEnv)),
+      m_pXFAWidgetHandler(new CPDFSDK_XFAWidgetHandler(pFormFillEnv)),
 #endif  // PDF_ENABLE_XFA
-      m_pEnv(pEnv) {
-  m_pWidgetHandler->SetFormFiller(m_pEnv->GetInteractiveFormFiller());
+      m_pFormFillEnv(pFormFillEnv) {
+  m_pWidgetHandler->SetFormFiller(m_pFormFillEnv->GetInteractiveFormFiller());
 }
 
 CPDFSDK_AnnotHandlerMgr::~CPDFSDK_AnnotHandlerMgr() {}
@@ -195,14 +195,15 @@
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
                                                  int nKeyCode,
                                                  int nFlag) {
-  if (m_pEnv->IsCTRLKeyDown(nFlag) || m_pEnv->IsALTKeyDown(nFlag))
+  if (m_pFormFillEnv->IsCTRLKeyDown(nFlag) ||
+      m_pFormFillEnv->IsALTKeyDown(nFlag))
     return GetAnnotHandler(pAnnot)->OnKeyDown(pAnnot, nKeyCode, nFlag);
 
   CPDFSDK_PageView* pPage = pAnnot->GetPageView();
   CPDFSDK_Annot* pFocusAnnot = pPage->GetFocusAnnot();
   if (pFocusAnnot && (nKeyCode == FWL_VKEY_Tab)) {
     CPDFSDK_Annot::ObservedPtr pNext(
-        GetNextAnnot(pFocusAnnot, !m_pEnv->IsSHIFTKeyDown(nFlag)));
+        GetNextAnnot(pFocusAnnot, !m_pFormFillEnv->IsSHIFTKeyDown(nFlag)));
     if (pNext && pNext.Get() != pFocusAnnot) {
       pPage->GetFormFillEnv()->SetFocusAnnot(&pNext);
       return TRUE;