Remove FX_BOOL from fpdfsdk.
Review-Url: https://codereview.chromium.org/2453683011
diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h
index 666ef84..fb0e637 100644
--- a/fpdfsdk/javascript/JS_EventHandler.h
+++ b/fpdfsdk/javascript/JS_EventHandler.h
@@ -81,78 +81,54 @@
void OnField_Calculate(CPDF_FormField* pSource,
CPDF_FormField* pTarget,
CFX_WideString& Value,
- FX_BOOL& bRc);
+ bool& bRc);
void OnField_Format(CPDF_FormField* pTarget,
CFX_WideString& Value,
- FX_BOOL bWillCommit);
+ bool bWillCommit);
void OnField_Keystroke(CFX_WideString& strChange,
const CFX_WideString& strChangeEx,
- FX_BOOL KeyDown,
- FX_BOOL bModifier,
+ bool KeyDown,
+ bool bModifier,
int& nSelEnd,
int& nSelStart,
- FX_BOOL bShift,
+ bool bShift,
CPDF_FormField* pTarget,
CFX_WideString& Value,
- FX_BOOL bWillCommit,
- FX_BOOL bFieldFull,
- FX_BOOL& bRc);
+ bool bWillCommit,
+ bool bFieldFull,
+ bool& bRc);
void OnField_Validate(CFX_WideString& strChange,
const CFX_WideString& strChangeEx,
- FX_BOOL bKeyDown,
- FX_BOOL bModifier,
- FX_BOOL bShift,
+ bool bKeyDown,
+ bool bModifier,
+ bool bShift,
CPDF_FormField* pTarget,
CFX_WideString& Value,
- FX_BOOL& bRc);
+ bool& bRc);
- void OnField_MouseDown(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDF_FormField* pTarget);
- void OnField_MouseEnter(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDF_FormField* pTarget);
- void OnField_MouseExit(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDF_FormField* pTarget);
- void OnField_MouseUp(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDF_FormField* pTarget);
- void OnField_Blur(FX_BOOL bModifier,
- FX_BOOL bShift,
+ void OnField_MouseDown(bool bModifier, bool bShift, CPDF_FormField* pTarget);
+ void OnField_MouseEnter(bool bModifier, bool bShift, CPDF_FormField* pTarget);
+ void OnField_MouseExit(bool bModifier, bool bShift, CPDF_FormField* pTarget);
+ void OnField_MouseUp(bool bModifier, bool bShift, CPDF_FormField* pTarget);
+ void OnField_Blur(bool bModifier,
+ bool bShift,
CPDF_FormField* pTarget,
const CFX_WideString& Value);
- void OnField_Focus(FX_BOOL bModifier,
- FX_BOOL bShift,
+ void OnField_Focus(bool bModifier,
+ bool bShift,
CPDF_FormField* pTarget,
const CFX_WideString& Value);
- void OnScreen_Focus(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
- void OnScreen_Open(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen);
- void OnScreen_Close(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_MouseDown(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_MouseUp(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_MouseEnter(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_MouseExit(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_InView(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
- void OnScreen_OutView(FX_BOOL bModifier,
- FX_BOOL bShift,
- CPDFSDK_Annot* pScreen);
+ void OnScreen_Focus(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_Blur(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_Open(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_Close(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_MouseDown(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_MouseUp(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_MouseEnter(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_MouseExit(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_InView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
+ void OnScreen_OutView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen);
void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark);
void OnLink_MouseUp(CPDFSDK_FormFillEnvironment* pFormFillEnv);
@@ -166,24 +142,24 @@
public:
void Initial(JS_EVENT_T type);
void Destroy();
- FX_BOOL IsValid();
+ bool IsValid();
CFX_WideString& Change();
CFX_WideString ChangeEx();
int CommitKey();
- FX_BOOL FieldFull();
- FX_BOOL KeyDown();
- FX_BOOL Modifier();
+ bool FieldFull();
+ bool KeyDown();
+ bool Modifier();
const FX_WCHAR* Name();
const FX_WCHAR* Type();
- FX_BOOL& Rc();
+ bool& Rc();
int& SelEnd();
int& SelStart();
- FX_BOOL Shift();
+ bool Shift();
Field* Source();
Field* Target_Field();
CFX_WideString& Value();
- FX_BOOL WillCommit();
+ bool WillCommit();
CFX_WideString TargetName();
JS_EVENT_T EventType() { return m_eEventType; }
@@ -191,7 +167,7 @@
public:
CJS_Context* m_pJSContext;
JS_EVENT_T m_eEventType;
- FX_BOOL m_bValid;
+ bool m_bValid;
CFX_WideString m_strTargetName;
CFX_WideString m_strSourceName;
@@ -199,18 +175,18 @@
CFX_WideString m_WideStrChangeDu;
CFX_WideString m_WideStrChangeEx;
int m_nCommitKey;
- FX_BOOL m_bKeyDown;
- FX_BOOL m_bModifier;
- FX_BOOL m_bShift;
+ bool m_bKeyDown;
+ bool m_bModifier;
+ bool m_bShift;
int* m_pISelEnd;
int m_nSelEndDu;
int* m_pISelStart;
int m_nSelStartDu;
- FX_BOOL m_bWillCommit;
+ bool m_bWillCommit;
CFX_WideString* m_pValue;
- FX_BOOL m_bFieldFull;
- FX_BOOL* m_pbRc;
- FX_BOOL m_bRcDu;
+ bool m_bFieldFull;
+ bool* m_pbRc;
+ bool m_bRcDu;
CPDF_Bookmark* m_pTargetBookMark;
CPDFSDK_FormFillEnvironment* m_pTargetFormFillEnv;