diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /fpdfsdk/src/javascript/JS_GlobalData.cpp | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_GlobalData.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_GlobalData.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 8c7bd7150e..71e3a50a60 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -296,7 +296,7 @@ void CJS_GlobalData::SetGlobalVariableNull(const FX_CHAR* propname) } } -FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, FX_BOOL bPersistent) +bool CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, bool bPersistent) { ASSERT(propname != NULL); CFX_ByteString sPropName = propname; @@ -304,18 +304,18 @@ FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, FX_ sPropName.TrimLeft(); sPropName.TrimRight(); - if (sPropName.GetLength() == 0) return FALSE; + if (sPropName.GetLength() == 0) return false; if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) { pData->bPersistent = bPersistent; - return TRUE; + return true; } - return FALSE; + return false; } -FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) +bool CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) { ASSERT(propname != NULL); CFX_ByteString sPropName = propname; @@ -323,7 +323,7 @@ FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) sPropName.TrimLeft(); sPropName.TrimRight(); - if (sPropName.GetLength() == 0) return FALSE; + if (sPropName.GetLength() == 0) return false; int nFind = FindGlobalVariable(sPropName); @@ -331,10 +331,10 @@ FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) { delete m_arrayGlobalData.GetAt(nFind); m_arrayGlobalData.RemoveAt(nFind); - return TRUE; + return true; } - return FALSE; + return false; } int32_t CJS_GlobalData::GetSize() const @@ -417,7 +417,7 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() break; } SetGlobalVariableNumber(sEntry, dData); - SetGlobalVariablePersistent(sEntry, TRUE); + SetGlobalVariablePersistent(sEntry, true); } break; case JS_GLOBALDATA_TYPE_BOOLEAN: @@ -425,7 +425,7 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() FX_WORD wData = *((FX_WORD*)p); p += sizeof(FX_WORD); SetGlobalVariableBoolean(sEntry, (bool)(wData == 1)); - SetGlobalVariablePersistent(sEntry, TRUE); + SetGlobalVariablePersistent(sEntry, true); } break; case JS_GLOBALDATA_TYPE_STRING: @@ -437,14 +437,14 @@ void CJS_GlobalData::LoadGlobalPersistentVariables() break; SetGlobalVariableString(sEntry, CFX_ByteString(p, dwLength)); - SetGlobalVariablePersistent(sEntry, TRUE); + SetGlobalVariablePersistent(sEntry, true); p += sizeof(char) * dwLength; } break; case JS_GLOBALDATA_TYPE_NULL: { SetGlobalVariableNull(sEntry); - SetGlobalVariablePersistent(sEntry, TRUE); + SetGlobalVariablePersistent(sEntry, true); } } } |