Rename CPDFDoc_Environment to CPDFSDK_Environment

CPDFDoc_Environment does not fit with the general naming scheme of the rest of
the files in fpdfsdk. This CL updates the naming to CPDFSDK_Environment to
better fit with the surrounding files.

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

7 files changed, 44 insertions, 42 deletions

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 56eb3fccc6..f6332cdc86 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -11,8 +11,8 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h"
-#include "fpdfsdk/include/cpdfdoc_environment.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
+#include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/cpdfsdk_interform.h"
 #include "fpdfsdk/include/cpdfsdk_pageview.h"
 #include "fpdfsdk/javascript/ijs_runtime.h"
@@ -65,7 +65,7 @@ void CPDFXFA_DocEnvironment::InvalidateRect(CXFA_FFPageView* pPageView,
   if (!pPage)
     return;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
 
@@ -97,7 +97,7 @@ void CPDFXFA_DocEnvironment::DisplayCaret(CXFA_FFWidget* hWidget,
   if (!pPage)
     return;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
 
@@ -124,7 +124,7 @@ FX_BOOL CPDFXFA_DocEnvironment::GetPopupPos(CXFA_FFWidget* hWidget,
 
   CXFA_WidgetAcc* pWidgetAcc = hWidget->GetDataAcc();
   int nRotate = pWidgetAcc->GetRotate();
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return FALSE;
 
@@ -235,7 +235,7 @@ FX_BOOL CPDFXFA_DocEnvironment::PopupMenu(CXFA_FFWidget* hWidget,
   if (!pPage)
     return FALSE;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return FALSE;
 
@@ -258,7 +258,7 @@ FX_BOOL CPDFXFA_DocEnvironment::PopupMenu(CXFA_FFWidget* hWidget,
 
 void CPDFXFA_DocEnvironment::PageViewEvent(CXFA_FFPageView* pPageView,
                                            uint32_t dwFlags) {
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
 
@@ -340,7 +340,7 @@ int32_t CPDFXFA_DocEnvironment::GetCurrentPage(CXFA_FFDoc* hDoc) {
   if (m_pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA)
     return -1;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return -1;
 
@@ -355,7 +355,7 @@ void CPDFXFA_DocEnvironment::SetCurrentPage(CXFA_FFDoc* hDoc,
     return;
   }
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
   pEnv->FFI_SetCurrentPage(this, iCurPage);
@@ -410,7 +410,7 @@ void CPDFXFA_DocEnvironment::ExportData(CXFA_FFDoc* hDoc,
       m_pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
     return;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
 
@@ -508,7 +508,7 @@ void CPDFXFA_DocEnvironment::GotoURL(CXFA_FFDoc* hDoc,
   if (m_pDocument->GetDocType() != DOCTYPE_DYNAMIC_XFA)
     return;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return;
 
@@ -565,7 +565,7 @@ void CPDFXFA_DocEnvironment::Print(CXFA_FFDoc* hDoc,
   if (hDoc != m_pDocument->GetXFADoc())
     return;
 
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv || !pEnv->GetFormFillInfo() ||
       !pEnv->GetFormFillInfo()->m_pJsPlatform ||
       !pEnv->GetFormFillInfo()->m_pJsPlatform->Doc_print) {
@@ -632,7 +632,7 @@ FX_BOOL CPDFXFA_DocEnvironment::OnBeforeNotifySubmit() {
   while (pWidgetAcc) {
     int fRet = pWidgetAcc->ProcessValidate(-1);
     if (fRet == XFA_EVENTERROR_Error) {
-      CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+      CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
       if (!pEnv)
         return FALSE;
 
@@ -694,7 +694,7 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitData(CXFA_FFDoc* hDoc,
 IFX_FileRead* CPDFXFA_DocEnvironment::OpenLinkedFile(
     CXFA_FFDoc* hDoc,
     const CFX_WideString& wsLink) {
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return FALSE;
 
@@ -717,7 +717,7 @@ FX_BOOL CPDFXFA_DocEnvironment::ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,
     return FALSE;
 
   CFX_ByteString content;
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return FALSE;
 
@@ -888,7 +888,7 @@ FX_BOOL CPDFXFA_DocEnvironment::MailToInfo(CFX_WideString& csURL,
 
 FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc,
                                                    CXFA_Submit submit) {
-  CPDFDoc_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
+  CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv();
   if (!pEnv)
     return FALSE;
 
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
index 9f89a144cf..5cdd903877 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
@@ -7,7 +7,7 @@
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h"
 
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h"
-#include "fpdfsdk/include/cpdfdoc_environment.h"
+#include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "xfa/fxbarcode/include/BC_Library.h"
 #include "xfa/fxfa/include/xfa_ffapp.h"
@@ -61,7 +61,7 @@ FX_BOOL CPDFXFA_App::Initialize(v8::Isolate* pIsolate) {
   return TRUE;
 }
 
-FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFDoc_Environment* pEnv) {
+FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFSDK_Environment* pEnv) {
   if (!pEnv)
     return FALSE;
 
@@ -69,7 +69,7 @@ FX_BOOL CPDFXFA_App::AddFormFillEnv(CPDFDoc_Environment* pEnv) {
   return TRUE;
 }
 
-FX_BOOL CPDFXFA_App::RemoveFormFillEnv(CPDFDoc_Environment* pEnv) {
+FX_BOOL CPDFXFA_App::RemoveFormFillEnv(CPDFSDK_Environment* pEnv) {
   if (!pEnv)
     return FALSE;
 
@@ -87,7 +87,7 @@ void CPDFXFA_App::GetAppType(CFX_WideString& wsAppType) {
 }
 
 void CPDFXFA_App::GetAppName(CFX_WideString& wsName) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     wsName = pEnv->FFI_GetAppName();
   }
@@ -98,14 +98,14 @@ void CPDFXFA_App::SetAppType(const CFX_WideStringC& wsAppType) {
 }
 
 void CPDFXFA_App::GetLanguage(CFX_WideString& wsLanguage) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     wsLanguage = pEnv->FFI_GetLanguage();
   }
 }
 
 void CPDFXFA_App::GetPlatform(CFX_WideString& wsPlatform) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     wsPlatform = pEnv->FFI_GetPlatform();
   }
@@ -120,7 +120,7 @@ void CPDFXFA_App::GetVersion(CFX_WideString& wsVersion) {
 }
 
 void CPDFXFA_App::Beep(uint32_t dwType) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     pEnv->JS_appBeep(dwType);
   }
@@ -130,7 +130,7 @@ int32_t CPDFXFA_App::MsgBox(const CFX_WideString& wsMessage,
                             const CFX_WideString& wsTitle,
                             uint32_t dwIconType,
                             uint32_t dwButtonType) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (!pEnv)
     return -1;
 
@@ -184,7 +184,7 @@ CFX_WideString CPDFXFA_App::Response(const CFX_WideString& wsQuestion,
                                      const CFX_WideString& wsDefaultAnswer,
                                      FX_BOOL bMark) {
   CFX_WideString wsAnswer;
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     int nLength = 2048;
     char* pBuff = new char[nLength];
@@ -205,7 +205,7 @@ CFX_WideString CPDFXFA_App::Response(const CFX_WideString& wsQuestion,
 }
 
 int32_t CPDFXFA_App::GetCurDocumentInBatch() {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     return pEnv->FFI_GetCurDocument();
   }
@@ -213,7 +213,7 @@ int32_t CPDFXFA_App::GetCurDocumentInBatch() {
 }
 
 int32_t CPDFXFA_App::GetDocumentCountInBatch() {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv) {
     return pEnv->FFI_GetDocumentCount();
   }
@@ -222,7 +222,7 @@ int32_t CPDFXFA_App::GetDocumentCountInBatch() {
 }
 
 IFX_FileRead* CPDFXFA_App::DownloadURL(const CFX_WideString& wsURL) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   return pEnv ? pEnv->FFI_DownloadFromURL(wsURL.c_str()) : nullptr;
 }
 
@@ -232,7 +232,7 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL,
                                     const CFX_WideString& wsEncode,
                                     const CFX_WideString& wsHeader,
                                     CFX_WideString& wsResponse) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (!pEnv)
     return FALSE;
 
@@ -245,7 +245,7 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL,
 FX_BOOL CPDFXFA_App::PutRequestURL(const CFX_WideString& wsURL,
                                    const CFX_WideString& wsData,
                                    const CFX_WideString& wsEncode) {
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   return pEnv &&
          pEnv->FFI_PutRequestURL(wsURL.c_str(), wsData.c_str(),
                                  wsEncode.c_str());
@@ -350,7 +350,7 @@ void CPDFXFA_App::LoadString(int32_t iStringID, CFX_WideString& wsString) {
 
 IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() {
   CXFA_FWLAdapterTimerMgr* pAdapter = nullptr;
-  CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
+  CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv)
     pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);
   return pAdapter;
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
index 6c691e6c9b..ed9407858b 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
@@ -10,8 +10,8 @@
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h"
-#include "fpdfsdk/include/cpdfdoc_environment.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
+#include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/cpdfsdk_interform.h"
 #include "fpdfsdk/include/cpdfsdk_pageview.h"
 #include "fpdfsdk/include/fsdk_define.h"
@@ -192,7 +192,7 @@ void CPDFXFA_Document::RemovePage(CPDFXFA_Page* page) {
 }
 
 CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument(
-    CPDFDoc_Environment* pFormFillEnv) {
+    CPDFSDK_Environment* pFormFillEnv) {
   if (!m_pSDKDoc && pFormFillEnv)
     m_pSDKDoc.reset(new CPDFSDK_Document(this, pFormFillEnv));
   return m_pSDKDoc.get();
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
index b3a77a842c..aa6c2d4e9d 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "fpdfsdk/include/cpdfdoc_environment.h"
+#include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/fsdk_define.h"
 
 std::vector<CFWL_TimerInfo*>* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr;
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
index 18cac4405b..0274acb2cc 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
@@ -9,7 +9,7 @@
 
 #include "xfa/fxfa/include/fxfa.h"
 
-class CPDFDoc_Environment;
+class CPDFSDK_Environment;
 class IFXJS_Runtime;
 
 class CPDFXFA_App : public IXFA_AppProvider {
@@ -23,8 +23,8 @@ class CPDFXFA_App : public IXFA_AppProvider {
   FX_BOOL Initialize(v8::Isolate* pIsolate);
   CXFA_FFApp* GetXFAApp() { return m_pXFAApp.get(); }
 
-  FX_BOOL AddFormFillEnv(CPDFDoc_Environment* pEnv);
-  FX_BOOL RemoveFormFillEnv(CPDFDoc_Environment* pEnv);
+  FX_BOOL AddFormFillEnv(CPDFSDK_Environment* pEnv);
+  FX_BOOL RemoveFormFillEnv(CPDFSDK_Environment* pEnv);
 
   FX_BOOL IsJavaScriptInitialized() const { return m_bJavaScriptInitialized; }
   void SetJavaScriptInitialized(FX_BOOL bInitialized) {
@@ -70,7 +70,7 @@ class CPDFXFA_App : public IXFA_AppProvider {
   void LoadString(int32_t iStringID, CFX_WideString& wsString) override;
   IFWL_AdapterTimerMgr* GetTimerMgr() override;
 
-  CFX_ArrayTemplate<CPDFDoc_Environment*> m_pEnvList;
+  CFX_ArrayTemplate<CPDFSDK_Environment*> m_pEnvList;
 
  protected:
   FX_BOOL m_bJavaScriptInitialized;
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
index acced2c434..77597d47c2 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
@@ -12,11 +12,13 @@
 #include "fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 
+class CPDFSDK_Document;
+class CPDFSDK_Environment;
 class CPDFXFA_App;
 class CPDFXFA_Page;
-class CPDFSDK_Document;
-class CPDFDoc_Environment;
 class CXFA_FFDocHandler;
+class IJS_Runtime;
+class IJS_Context;
 
 enum LoadStatus {
   FXFA_LOADSTATUS_PRELOAD = 0,
@@ -45,7 +47,7 @@ class CPDFXFA_Document {
   void RemovePage(CPDFXFA_Page* page);
   int GetDocType() { return m_iDocType; }
 
-  CPDFSDK_Document* GetSDKDocument(CPDFDoc_Environment* pFormFillEnv);
+  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
 
   void ClearChangeMark();
 
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
index fb5bd0d1b7..fd7a678fdd 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
@@ -21,7 +21,7 @@ struct CFWL_TimerInfo;
 
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
-  CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) {}
+  CXFA_FWLAdapterTimerMgr(CPDFSDK_Environment* pEnv) : m_pEnv(pEnv) {}
 
   FWL_Error Start(IFWL_Timer* pTimer,
                   uint32_t dwElapse,
@@ -33,7 +33,7 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
   static void TimerProc(int32_t idEvent);
 
   static std::vector<CFWL_TimerInfo*>* s_TimerArray;
-  CPDFDoc_Environment* const m_pEnv;
+  CPDFSDK_Environment* const m_pEnv;
 };
 
 struct CFWL_TimerInfo : public IFWL_TimerInfo {