Merge to XFA: Remove if checks after new.

fpdfsdk/include/fxedit/fxet_edit.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 #define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 97 matching lines @@
 
   void operator=(CFX_Edit_LineRectArray& rects) {
     Empty();
     for (int32_t i = 0, sz = rects.GetSize(); i < sz; i++)
       m_LineRects.Add(rects.GetAt(i));
 
     rects.RemoveAll();
   }
 
   void Add(const CPVT_WordRange& wrLine, const CPDF_Rect& rcLine) {
-    if (CFX_Edit_LineRect* pRect = new CFX_Edit_LineRect(wrLine, rcLine))
-      m_LineRects.Add(pRect);
+    m_LineRects.Add(new CFX_Edit_LineRect(wrLine, rcLine));
   }
 
   int32_t GetSize() const { return m_LineRects.GetSize(); }
 
   CFX_Edit_LineRect* GetAt(int32_t nIndex) const {
     if (nIndex < 0 || nIndex >= m_LineRects.GetSize())
       return NULL;
 
     return m_LineRects.GetAt(nIndex);
   }
 
   CFX_ArrayTemplate<CFX_Edit_LineRect*> m_LineRects;
 };
 
 class CFX_Edit_RectArray {
  public:
   CFX_Edit_RectArray() {}
 
   virtual ~CFX_Edit_RectArray() { Empty(); }
 
   void Empty() {
     for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++)
       delete m_Rects.GetAt(i);
 
     m_Rects.RemoveAll();
   }
 
   void Add(const CPDF_Rect& rect) {
-    // check for overlaped area
-    for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++)
-      if (CPDF_Rect* pRect = m_Rects.GetAt(i))
-        if (pRect->Contains(rect))
-          return;
+    // check for overlapped area
+    for (int32_t i = 0, sz = m_Rects.GetSize(); i < sz; i++) {
+      CPDF_Rect* pRect = m_Rects.GetAt(i);
+      if (pRect && pRect->Contains(rect))
+        return;
+    }
 
-    if (CPDF_Rect* pNewRect = new CPDF_Rect(rect))
-      m_Rects.Add(pNewRect);
+    m_Rects.Add(new CPDF_Rect(rect));
   }
 
   int32_t GetSize() const { return m_Rects.GetSize(); }
 
   CPDF_Rect* GetAt(int32_t nIndex) const {
     if (nIndex < 0 || nIndex >= m_Rects.GetSize())
       return NULL;
 
     return m_Rects.GetAt(nIndex);
   }
@@ skipping 648 matching lines @@
   int32_t GetTypeDescent(int32_t nFontIndex);
   int32_t GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex);
   int32_t GetDefaultFontIndex();
   FX_BOOL IsLatinWord(FX_WORD word);
 
  private:
   IFX_Edit_FontMap* m_pFontMap;
 };
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_