Revert "FX Bool considered harmful, part 3"

This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org

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

1 files changed, 31 insertions, 31 deletions

diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index 79d01a02f8..2e2cf37a5e 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -21,8 +21,8 @@ public:
 	virtual ~CJS_Context();
 
 public:
-	virtual bool				Compile(const CFX_WideString& script, CFX_WideString& info);
-	virtual bool				RunScript(const CFX_WideString& script, CFX_WideString& info);
+	virtual FX_BOOL				Compile(const CFX_WideString& script, CFX_WideString& info);
+	virtual FX_BOOL				RunScript(const CFX_WideString& script, CFX_WideString& info);
 
 public:
 	virtual void				OnApp_Init();
@@ -39,32 +39,32 @@ public:
 	virtual void				OnPage_InView(CPDFSDK_Document* pTarget);
 	virtual void				OnPage_OutView(CPDFSDK_Document* pTarget);
 
-	virtual void				OnField_MouseDown(bool bModifier, bool bShift, CPDF_FormField *pTarget);
-	virtual void				OnField_MouseEnter(bool bModifier, bool bShift, CPDF_FormField *pTarget);
-	virtual void				OnField_MouseExit(bool bModifier, bool bShift, CPDF_FormField *pTarget);
-	virtual void				OnField_MouseUp(bool bModifier, bool bShift, CPDF_FormField *pTarget);
-	virtual void				OnField_Focus(bool bModifier, bool bShift, CPDF_FormField* pTarget, const CFX_WideString& Value);
-	virtual void				OnField_Blur(bool bModifier, bool bShift, CPDF_FormField* pTarget, const CFX_WideString& Value);
+	virtual void				OnField_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField *pTarget);
+	virtual void				OnField_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField *pTarget);
+	virtual void				OnField_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField *pTarget);
+	virtual void				OnField_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField *pTarget);
+	virtual void				OnField_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value);
+	virtual void				OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value);
 
-	virtual void				OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, bool& bRc);
-	virtual void				OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, bool bWillCommit);
+	virtual void				OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc);
+	virtual void				OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit);
 	virtual void				OnField_Keystroke(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
-									bool bKeyDown, bool bModifier, int &nSelEnd,int &nSelStart, bool bShift,
-									CPDF_FormField* pTarget, CFX_WideString& Value, bool bWillCommit,
-									bool bFieldFull, bool &bRc);
-	virtual void				OnField_Validate(CFX_WideString& strChange, const CFX_WideString& strChangeEx, bool bKeyDown,
-									bool bModifier, bool bShift, CPDF_FormField* pTarget, CFX_WideString& Value, bool& bRc);
-
-	virtual void				OnScreen_Focus(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_Blur(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_Open(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_Close(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_MouseDown(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_MouseUp(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_MouseEnter(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_MouseExit(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_InView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
-	virtual void				OnScreen_OutView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+									FX_BOOL bKeyDown, FX_BOOL bModifier, int &nSelEnd,int &nSelStart, FX_BOOL bShift,
+									CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit,
+									FX_BOOL bFieldFull, FX_BOOL &bRc);
+	virtual void				OnField_Validate(CFX_WideString& strChange, const CFX_WideString& strChangeEx, FX_BOOL bKeyDown,
+									FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc);
+
+	virtual void				OnScreen_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_Open(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_Close(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_InView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
+	virtual void				OnScreen_OutView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
 
 	virtual void				OnBookmark_MouseUp(CPDF_Bookmark* pBookMark);
 	virtual void				OnLink_MouseUp(CPDFSDK_Document* pTarget);
@@ -74,14 +74,14 @@ public:
 	virtual void				OnConsole_Exec();
 	virtual void				OnExternal_Exec();
 
-	virtual void				EnableMessageBox(bool bEnable) {m_bMsgBoxEnable = bEnable;}
-	bool						IsMsgBoxEnabled() const {return m_bMsgBoxEnable;}
+	virtual void				EnableMessageBox(FX_BOOL bEnable) {m_bMsgBoxEnable = bEnable;}
+	FX_BOOL						IsMsgBoxEnabled() const {return m_bMsgBoxEnable;}
 
 public:
 	CPDFDoc_Environment*			GetReaderApp();
 	CJS_Runtime*				GetJSRuntime(){return m_pRuntime;}
 
-	bool						DoJob(int nMode, const CFX_WideString& script, CFX_WideString& info);
+	FX_BOOL						DoJob(int nMode, const CFX_WideString& script, CFX_WideString& info);
 
 	CJS_EventHandler*			GetEventHandler(){return m_pEventHandler;};
 	CPDFSDK_Document*			GetReaderDocument();
@@ -90,8 +90,8 @@ private:
 	CJS_Runtime*				m_pRuntime;
 	CJS_EventHandler*			m_pEventHandler;
 
-	bool						m_bBusy;
-	bool						m_bMsgBoxEnable;
+	FX_BOOL						m_bBusy;
+	FX_BOOL						m_bMsgBoxEnable;
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_