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_iterator.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_iterator.cpp')
| -rw-r--r-- | xfa/fde/fde_iterator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp index 755bff543f..53d86e8520 100644 --- a/xfa/fde/fde_iterator.cpp +++ b/xfa/fde/fde_iterator.cpp @@ -15,7 +15,7 @@ CFDE_VisualSetIterator::~CFDE_VisualSetIterator() { } FX_BOOL CFDE_VisualSetIterator::AttachCanvas(IFDE_CanvasSet* pCanvas) { - FXSYS_assert(pCanvas); + ASSERT(pCanvas); m_CanvasStack.RemoveAll(); FDE_CANVASITEM canvas; @@ -38,7 +38,7 @@ FX_BOOL CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) { m_dwFilter = dwObjects; FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement(); - FXSYS_assert(pCanvas && pCanvas->pCanvas); + ASSERT(pCanvas && pCanvas->pCanvas); pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(nullptr); return !!pCanvas->hPos; @@ -53,7 +53,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet, IFDE_CanvasSet** ppCanvasSet) { while (m_CanvasStack.GetSize() > 0) { FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement(); - FXSYS_assert(pCanvas && pCanvas->pCanvas); + ASSERT(pCanvas && pCanvas->pCanvas); if (!pCanvas->hPos) { if (m_CanvasStack.GetSize() == 1) @@ -65,7 +65,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet, do { FDE_HVISUALOBJ hObj = pCanvas->pCanvas->GetNext( pCanvas->hCanvas, pCanvas->hPos, pVisualSet); - FXSYS_assert(hObj); + ASSERT(hObj); FDE_VISUALOBJTYPE eType = pVisualSet->GetType(); if (eType == FDE_VISUALOBJ_Canvas) { |