From cfb77ccb1c057d6beb73f0043e42eee8c4822f84 Mon Sep 17 00:00:00 2001
From: thestig <thestig@chromium.org>
Date: Fri, 10 Jun 2016 12:21:53 -0700
Subject: Get rid of NULLs in xfa/fde/

Review-Url: https://codereview.chromium.org/2039923004
---
 xfa/fde/cfde_txtedtbuf.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'xfa/fde/cfde_txtedtbuf.cpp')

diff --git a/xfa/fde/cfde_txtedtbuf.cpp b/xfa/fde/cfde_txtedtbuf.cpp
index 81b586f075..7af5a1892b 100644
--- a/xfa/fde/cfde_txtedtbuf.cpp
+++ b/xfa/fde/cfde_txtedtbuf.cpp
@@ -19,7 +19,7 @@ CFDE_TxtEdtBuf::CFDE_TxtEdtBuf()
     : m_nChunkSize(kDefaultChunkSize),
       m_nTotal(0),
       m_bChanged(FALSE),
-      m_pAllocator(NULL) {
+      m_pAllocator(nullptr) {
   ASSERT(m_nChunkSize);
   ResetChunkBuffer(kDefaultChunkCount, m_nChunkSize);
 }
@@ -196,7 +196,7 @@ void CFDE_TxtEdtBuf::Delete(int32_t nIndex, int32_t nLength) {
     if (lpChunk->nUsed == 0) {
       m_pAllocator->Free(lpChunk);
       m_Chunks.RemoveAt(cpEnd.nChunkIndex);
-      lpChunk = NULL;
+      lpChunk = nullptr;
     }
     nLength -= nDeleted;
     cpEnd.nChunkIndex--;
@@ -260,9 +260,8 @@ FX_BOOL CFDE_TxtEdtBuf::Optimize(IFX_Pause* pPause) {
     } else {
       lpPreChunk = lpCurChunk;
     }
-    if (pPause != NULL && pPause->NeedToPauseNow()) {
+    if (pPause && pPause->NeedToPauseNow())
       return FALSE;
-    }
   }
   m_bChanged = FALSE;
   return TRUE;
-- 
cgit v1.2.3