diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-27 12:26:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-27 12:26:01 -0700 |
commit | 43854a5073602a4613131aa6dbac5f7b9a095bcd (patch) | |
tree | 653ebf0cd690e13d1ca9e315ffeb34f8ac85cfbb /xfa/fee/fde_txtedtpage.cpp | |
parent | b2f6f9158f54cee1825830c7ed57fe9d89cff26e (diff) | |
download | pdfium-43854a5073602a4613131aa6dbac5f7b9a095bcd.tar.xz |
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
Diffstat (limited to 'xfa/fee/fde_txtedtpage.cpp')
-rw-r--r-- | xfa/fee/fde_txtedtpage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fee/fde_txtedtpage.cpp b/xfa/fee/fde_txtedtpage.cpp index 4aadb397da..5faafebd55 100644 --- a/xfa/fee/fde_txtedtpage.cpp +++ b/xfa/fee/fde_txtedtpage.cpp @@ -179,8 +179,8 @@ FX_BOOL CFDE_TxtEdtPage::GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) { int32_t CFDE_TxtEdtPage::GetCharRect(int32_t nIndex, CFX_RectF& rect, FX_BOOL bBBox) const { - FXSYS_assert(m_nRefCount > 0); - FXSYS_assert(nIndex >= 0 && nIndex < m_nCharCount); + ASSERT(m_nRefCount > 0); + ASSERT(nIndex >= 0 && nIndex < m_nCharCount); if (m_nRefCount < 1) { return 0; } @@ -199,7 +199,7 @@ int32_t CFDE_TxtEdtPage::GetCharRect(int32_t nIndex, return pPiece->nBidiLevel; } } - FXSYS_assert(0); + ASSERT(0); return 0; } int32_t CFDE_TxtEdtPage::GetCharIndex(const CFX_PointF& fPoint, @@ -556,7 +556,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox, return 0; } void CFDE_TxtEdtPage::UnloadPage(const CFX_RectF* pClipBox) { - FXSYS_assert(m_nRefCount > 0); + ASSERT(m_nRefCount > 0); m_nRefCount--; if (m_nRefCount == 0) { m_PieceMassArr.RemoveAll(); |