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/javascript/Document.cpp

diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 6b795a0..0b08f66 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -402,10 +402,10 @@
     return FALSE;
 
   pRuntime->BeginBlock();
-  CPDFSDK_FormFillEnvironment* pEnv = pContext->GetFormFillEnv();
-  pEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI,
-                       cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(),
-                       cMsg.c_str());
+  CPDFSDK_FormFillEnvironment* pFormFillEnv = pContext->GetFormFillEnv();
+  pFormFillEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI,
+                               cTo.c_str(), cSubject.c_str(), cCc.c_str(),
+                               cBcc.c_str(), cMsg.c_str());
   pRuntime->EndBlock();
   return TRUE;
 }
@@ -751,9 +751,9 @@
   }
 
   pRuntime->BeginBlock();
-  CPDFSDK_FormFillEnvironment* pEnv = pRuntime->GetFormFillEnv();
-  pEnv->JS_docmailForm(nullptr, 0, bUI, cTo.c_str(), cSubject.c_str(),
-                       cCc.c_str(), cBcc.c_str(), cMsg.c_str());
+  CPDFSDK_FormFillEnvironment* pFormFillEnv = pRuntime->GetFormFillEnv();
+  pFormFillEnv->JS_docmailForm(nullptr, 0, bUI, cTo.c_str(), cSubject.c_str(),
+                               cCc.c_str(), cBcc.c_str(), cMsg.c_str());
   pRuntime->EndBlock();
 
   return TRUE;

fpdfsdk/javascript/PublicMethods.cpp

diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 344af5a..2310200 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -79,9 +79,9 @@
 }
 
 void AlertIfPossible(CJS_Context* pContext, const FX_WCHAR* swMsg) {
-  CPDFSDK_FormFillEnvironment* pEnv = pContext->GetFormFillEnv();
-  if (pEnv)
-    pEnv->JS_appAlert(swMsg, nullptr, 0, 3);
+  CPDFSDK_FormFillEnvironment* pFormFillEnv = pContext->GetFormFillEnv();
+  if (pFormFillEnv)
+    pFormFillEnv->JS_appAlert(swMsg, nullptr, 0, 3);
 }
 
 }  // namespace

fpdfsdk/javascript/global.cpp

diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
index 3ac8c40..eb7d2ca 100644
--- a/fpdfsdk/javascript/global.cpp
+++ b/fpdfsdk/javascript/global.cpp
@@ -49,16 +49,16 @@
 }
 
 JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject)
-    : CJS_EmbedObj(pJSObject), m_pEnv(nullptr) {}
+    : CJS_EmbedObj(pJSObject), m_pFormFillEnv(nullptr) {}
 
 JSGlobalAlternate::~JSGlobalAlternate() {
   DestroyGlobalPersisitentVariables();
   m_pGlobalData->Release();
 }
 
-void JSGlobalAlternate::Initial(CPDFSDK_FormFillEnvironment* pEnv) {
-  m_pEnv = pEnv;
-  m_pGlobalData = CJS_GlobalData::GetRetainedInstance(pEnv);
+void JSGlobalAlternate::Initial(CPDFSDK_FormFillEnvironment* pFormFillEnv) {
+  m_pFormFillEnv = pFormFillEnv;
+  m_pGlobalData = CJS_GlobalData::GetRetainedInstance(pFormFillEnv);
   UpdateGlobalPersistentVariables();
 }
 

fpdfsdk/javascript/global.h

diff --git a/fpdfsdk/javascript/global.h b/fpdfsdk/javascript/global.h
index 6240fbf..d5288e3 100644
--- a/fpdfsdk/javascript/global.h
+++ b/fpdfsdk/javascript/global.h
@@ -47,7 +47,7 @@
   FX_BOOL DelProperty(IJS_Context* cc,
                       const FX_WCHAR* propname,
                       CFX_WideString& sError);
-  void Initial(CPDFSDK_FormFillEnvironment* pEnv);
+  void Initial(CPDFSDK_FormFillEnvironment* pFormFillEnv);
 
  private:
   void UpdateGlobalPersistentVariables();
@@ -68,7 +68,7 @@
   std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal;
   CFX_WideString m_sFilePath;
   CJS_GlobalData* m_pGlobalData;
-  CPDFSDK_FormFillEnvironment* m_pEnv;
+  CPDFSDK_FormFillEnvironment* m_pFormFillEnv;
 };
 
 class CJS_Global : public CJS_Object {