Re-land else-after-returns

core/src/fpdfapi/fpdf_page/fpdf_page.cpp

 // 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
 
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "pageint.h"
 CPDF_PageObject* CPDF_PageObject::Create(int type)
@@ skipping 736 matching lines @@
     }
     m_pParser->Continue(pPause);
     if (m_pParser->GetStatus() == CPDF_ContentParser::Done) {
         m_ParseState = PDF_CONTENT_PARSED;
         delete m_pParser;
         m_pParser = NULL;
     }
 }
 int CPDF_PageObjects::EstimateParseProgress() const
 {
-    if (m_pParser == NULL) {
+    if (!m_pParser) {
         return m_ParseState == PDF_CONTENT_PARSED ? 100 : 0;
     }
     return m_pParser->EstimateProgress();
 }
 FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject)
 {
-    if (posInsertAfter == NULL) {
+    if (!posInsertAfter) {
         return m_ObjectList.AddHead(pNewObject);
-    } else {
-        return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
     }
+    return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
 }
 int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const
 {
     int index = 0;
     FX_POSITION pos = m_ObjectList.GetHeadPosition();
     while (pos) {
         CPDF_PageObject* pThisObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
         if (pThisObj == pObj) {
             return index;
         }
@@ skipping 290 matching lines @@
     matrix = m_PageMatrix;
     matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions()
 {
     m_bTextOnly = FALSE;
     m_bMarkedContent = TRUE;
     m_bSeparateForm = TRUE;
     m_bDecodeInlineImage = FALSE;
 }