From 43854a5073602a4613131aa6dbac5f7b9a095bcd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 27 Apr 2016 12:26:00 -0700 Subject: Standardize on ASSERT. There are currently three ways to assert in the code (ASSERT, FXSYS_assert and assert). This CL standardizes on ASSERT. The benefit of ASSERT is that it can be overridden if the platform requies and we can pickup the Chromium version if it has already been defined in the build. This does change behaviour. Currently FXSYS_assert is always defined but ASSERT is only defined in debug builds. So, the FXSYS_assert's would fire in Release builds. That will no longer happen. BUG=pdfium:219 Review-Url: https://codereview.chromium.org/1914303003 --- xfa/fde/css/fde_cssdeclaration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fde/css/fde_cssdeclaration.cpp') diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp index e48372c2ed..80945245cf 100644 --- a/xfa/fde/css/fde_cssdeclaration.cpp +++ b/xfa/fde/css/fde_cssdeclaration.cpp @@ -28,7 +28,7 @@ void CFDE_CSSDeclaration::GetNextProperty(FX_POSITION& pos, IFDE_CSSValue*& pValue, FX_BOOL& bImportant) const { const FDE_CSSPropertyHolder* pHolder = (const FDE_CSSPropertyHolder*)pos; - FXSYS_assert(pHolder != NULL); + ASSERT(pHolder != NULL); bImportant = pHolder->bImportant; eProperty = (FDE_CSSPROPERTY)pHolder->eProperty; pValue = pHolder->pValue; @@ -52,7 +52,7 @@ const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal( const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { - FXSYS_assert(iValueLen > 0); + ASSERT(iValueLen > 0); CFX_MapPtrToPtr* pCache = pArgs->pStringCache; void* pKey = NULL; if (pCache) { @@ -110,7 +110,7 @@ void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MEMAllocator* pStaticStore, FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { - FXSYS_assert(iValueLen > 0); + ASSERT(iValueLen > 0); FX_BOOL bImportant = FALSE; if (iValueLen >= 10 && pszValue[iValueLen - 10] == '!' && FX_wcsnicmp(L"important", pszValue + iValueLen - 9, 9) == 0) { @@ -260,7 +260,7 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, return ParseValueListProperty(pArgs, pszValue, iValueLen, bImportant); } default: - FXSYS_assert(FALSE); + ASSERT(FALSE); break; } return FALSE; -- cgit v1.2.3