Merge to XFA: Tidy up CPDFDOC_Environment.

Original Review URL: https://codereview.chromium.org/1235393002 .
(cherry picked from commit fb07e2843dad0774d5842c2b08e7792164efc14a)

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1244503002 .

1 files changed, 42 insertions, 50 deletions

diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index bb7d6c4108..2ee23f8877 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -8,8 +8,6 @@
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
-// #include "../../include/javascript/JS_MsgBox.h"
-// #include "../../include/javascript/JS_ResMgr.h"
 #include "../../include/javascript/JS_Context.h"
 
 JS_TIMER_MAPARRAY& GetTimeMap()
@@ -21,106 +19,102 @@ JS_TIMER_MAPARRAY& GetTimeMap()
 
 int FXJS_MsgBox(CPDFDoc_Environment* pApp, CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, FX_UINT nIcon)
 {
-	int nRet = 0;
+    if (!pApp)
+        return 0;
 
-	if (pApp)
-	{
-		CPDFSDK_Document* pDoc = pApp->GetCurrentDoc();
-		if(pDoc)
-			pDoc->KillFocusAnnot();
-		nRet = pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
-	}
+    if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
+        pDoc->KillFocusAnnot();
 
-	return nRet;
+    return pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
 }
 
 CPDFSDK_PageView* FXJS_GetPageView(IFXJS_Context* cc)
 {
-	if (CJS_Context* pContext = (CJS_Context *)cc)
-	{
-		if (pContext->GetReaderDocument())
-			return NULL;
-	}
-	return NULL;
+    if (CJS_Context* pContext = (CJS_Context *)cc)
+    {
+        if (pContext->GetReaderDocument())
+            return NULL;
+    }
+    return NULL;
 }
 
 /* ---------------------------------  CJS_EmbedObj --------------------------------- */
 
 CJS_EmbedObj::CJS_EmbedObj(CJS_Object* pJSObject) :
-	m_pJSObject(pJSObject)
+    m_pJSObject(pJSObject)
 {
 }
 
 CJS_EmbedObj::~CJS_EmbedObj()
 {
-	m_pJSObject = NULL;
+    m_pJSObject = NULL;
 
 }
 
 CPDFSDK_PageView* CJS_EmbedObj::JSGetPageView(IFXJS_Context* cc)
 {
-	return FXJS_GetPageView(cc);
+    return FXJS_GetPageView(cc);
 }
 
 int CJS_EmbedObj::MsgBox(CPDFDoc_Environment* pApp, CPDFSDK_PageView* pPageView,const FX_WCHAR* swMsg,const FX_WCHAR* swTitle,FX_UINT nType,FX_UINT nIcon)
 {
-	return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon);
+    return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon);
 }
 
 void CJS_EmbedObj::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg)
 {
-	CJS_Object::Alert(pContext, swMsg);
+    CJS_Object::Alert(pContext, swMsg);
 }
 
 CJS_Timer* CJS_EmbedObj::BeginTimer(CPDFDoc_Environment* pApp, FX_UINT nElapse)
 {
-	CJS_Timer* pTimer = new CJS_Timer(this,pApp);
-	pTimer->SetJSTimer(nElapse);
+    CJS_Timer* pTimer = new CJS_Timer(this,pApp);
+    pTimer->SetJSTimer(nElapse);
 
-	return pTimer;
+    return pTimer;
 }
 
 void CJS_EmbedObj::EndTimer(CJS_Timer* pTimer)
 {
-	ASSERT(pTimer != NULL);
-	pTimer->KillJSTimer();
-	delete pTimer;
+    ASSERT(pTimer != NULL);
+    pTimer->KillJSTimer();
+    delete pTimer;
 }
 
 /* ---------------------------------  CJS_Object --------------------------------- */
 void  FreeObject(const v8::WeakCallbackInfo<CJS_Object>& data)
 {
-	CJS_Object* pJSObj  = data.GetParameter();
+    CJS_Object* pJSObj  = data.GetParameter();
         pJSObj->ExitInstance();
         delete pJSObj;
-	JS_FreePrivate(data.GetInternalField(0));
+    JS_FreePrivate(data.GetInternalField(0));
 }
 
 void  DisposeObject(const v8::WeakCallbackInfo<CJS_Object>& data)
 {
-	CJS_Object* pJSObj  = data.GetParameter();
+    CJS_Object* pJSObj  = data.GetParameter();
         pJSObj->Dispose();
         data.SetSecondPassCallback(FreeObject);
 }
 
 CJS_Object::CJS_Object(JSFXObject pObject) :m_pEmbedObj(NULL)
 {
-	v8::Local<v8::Context> context = pObject->CreationContext();
-	m_pIsolate = context->GetIsolate();
-	m_pObject.Reset(m_pIsolate, pObject);
+    v8::Local<v8::Context> context = pObject->CreationContext();
+    m_pIsolate = context->GetIsolate();
+    m_pObject.Reset(m_pIsolate, pObject);
 };
 
 CJS_Object::~CJS_Object(void)
 {
-	delete m_pEmbedObj;
-	m_pEmbedObj = NULL;
+    delete m_pEmbedObj;
+    m_pEmbedObj = NULL;
 
-	m_pObject.Reset();
+    m_pObject.Reset();
 };
 
-void	CJS_Object::MakeWeak()
+void    CJS_Object::MakeWeak()
 {
-	m_pObject.SetWeak(
+    m_pObject.SetWeak(
             this, DisposeObject, v8::WeakCallbackType::kInternalFields);
 }
 
@@ -131,24 +125,22 @@ void    CJS_Object::Dispose()
 
 CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc)
 {
-	return FXJS_GetPageView(cc);
+    return FXJS_GetPageView(cc);
 }
 
 int CJS_Object::MsgBox(CPDFDoc_Environment* pApp, CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, FX_UINT nIcon)
 {
-	return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon);
+    return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon);
 }
 
 void CJS_Object::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg)
 {
-	ASSERT(pContext != NULL);
+    ASSERT(pContext != NULL);
 
-	if (pContext->IsMsgBoxEnabled())
-	{
-		CPDFDoc_Environment* pApp = pContext->GetReaderApp();
-		if(pApp)
-			pApp->JS_appAlert(swMsg, NULL, 0, 3);
-	}
+    if (pContext->IsMsgBoxEnabled())
+    {
+        CPDFDoc_Environment* pApp = pContext->GetReaderApp();
+        if(pApp)
+            pApp->JS_appAlert(swMsg, NULL, 0, 3);
+    }
 }
-
-