diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
| commit | f1e7c461dfabbff6b65a072f24f6711b34159361 (patch) | |
| tree | 3b0bb772a59669f06b86824a444fd06642592d4b /fpdfsdk/include/javascript/global.h | |
| parent | 320b2313d19869333ed453af546e61a9fc2b81c9 (diff) | |
| download | pdfium-f1e7c461dfabbff6b65a072f24f6711b34159361.tar.xz | |
Revert "FX_BOOL considered harmful, part 2."
This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9.
Reason for revert: build failure.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255693002 .
Diffstat (limited to 'fpdfsdk/include/javascript/global.h')
| -rw-r--r-- | fpdfsdk/include/javascript/global.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index 4c6ccd97b0..83e07f67c3 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -19,10 +19,10 @@ struct js_global_data { nType = 0; dData = 0; - bData = false; + bData = FALSE; sData = ""; - bPersistent = false; - bDeleted = false; + bPersistent = FALSE; + bDeleted = FALSE; } ~js_global_data() @@ -45,12 +45,12 @@ public: virtual ~global_alternate(); public: - bool setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); + FX_BOOL setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); public: - bool QueryProperty(const FX_WCHAR* propname); - bool DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue & vp, CFX_WideString & sError); - bool DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString & sError); + FX_BOOL QueryProperty(const FX_WCHAR* propname); + FX_BOOL DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue & vp, CFX_WideString & sError); + FX_BOOL DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString & sError); void Initial(CPDFDoc_Environment* pApp); @@ -58,7 +58,7 @@ private: void UpdateGlobalPersistentVariables(); void CommitGlobalPersisitentVariables(); void DestroyGlobalPersisitentVariables(); - bool SetGlobalVariables(const FX_CHAR* propname, int nType, + FX_BOOL SetGlobalVariables(const FX_CHAR* propname, int nType, double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent); void ObjectToArray(v8::Local<v8::Object> pObj, CJS_GlobalVariableArray& array); @@ -78,7 +78,7 @@ public: CJS_Global(JSFXObject pObject) : CJS_Object(pObject) {}; virtual ~CJS_Global(void){}; - virtual bool InitInstance(IFXJS_Context* cc); + virtual FX_BOOL InitInstance(IFXJS_Context* cc); DECLARE_SPECIAL_JS_CLASS(CJS_Global); |