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/fde/fde_gedevice.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/fde/fde_gedevice.cpp')
| -rw-r--r-- | xfa/fde/fde_gedevice.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 49345ffeaa..f99dc6c201 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -18,7 +18,7 @@ CFDE_RenderDevice::CFDE_RenderDevice(CFX_RenderDevice* pDevice, m_bOwnerDevice(bOwnerDevice), m_pCharPos(nullptr), m_iCharCount(0) { - FXSYS_assert(pDevice); + ASSERT(pDevice); FX_RECT rt = m_pDevice->GetClipBox(); m_rtClip.Set((FX_FLOAT)rt.left, (FX_FLOAT)rt.top, (FX_FLOAT)rt.Width(), @@ -73,7 +73,7 @@ FX_BOOL CFDE_RenderDevice::DrawImage(CFX_DIBSource* pDib, const CFX_RectF& dstRect, const CFX_Matrix* pImgMatrix, const CFX_Matrix* pDevMatrix) { - FXSYS_assert(pDib != NULL); + ASSERT(pDib != NULL); CFX_RectF srcRect; if (pSrcRect) { srcRect = *pSrcRect; @@ -110,8 +110,7 @@ FX_BOOL CFDE_RenderDevice::DrawString(CFDE_Brush* pBrush, int32_t iCount, FX_FLOAT fFontSize, const CFX_Matrix* pMatrix) { - FXSYS_assert(pBrush != NULL && pFont != NULL && pCharPos != NULL && - iCount > 0); + ASSERT(pBrush != NULL && pFont != NULL && pCharPos != NULL && iCount > 0); CFX_FontCache* pCache = CFX_GEModule::Get()->GetFontCache(); CFX_Font* pFxFont = (CFX_Font*)pFont->GetDevFont(); |