Merge to XFA: Remove Release() combo patch.

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"
-void CPDF_PageObject::Release()
-{
-    delete this;
-}
 CPDF_PageObject* CPDF_PageObject::Create(int type)
 {
     switch (type) {
         case PDFPAGE_TEXT:
             return FX_NEW CPDF_TextObject;
         case PDFPAGE_IMAGE:
             return FX_NEW CPDF_ImageObject;
         case PDFPAGE_PATH:
             return FX_NEW CPDF_PathObject;
         case PDFPAGE_SHADING:
             return FX_NEW CPDF_ShadingObject;
         case PDFPAGE_FORM:
             return FX_NEW CPDF_FormObject;
     }
     return NULL;
 }
+CPDF_PageObject::~CPDF_PageObject()
+{
+}
 CPDF_PageObject* CPDF_PageObject::Clone() const
 {
     CPDF_PageObject* pObj = Create(m_Type);
     pObj->Copy(this);
     return pObj;
 }
 void CPDF_PageObject::Copy(const CPDF_PageObject* pSrc)
 {
     if (m_Type != pSrc->m_Type) {
         return;
@@ skipping 642 matching lines @@
 CPDF_PageObjects::~CPDF_PageObjects()
 {
     if (m_pParser) {
         delete m_pParser;
     }
     if (!m_bReleaseMembers) {
         return;
     }
     FX_POSITION pos = m_ObjectList.GetHeadPosition();
     while (pos) {
-        CPDF_PageObject* pPageObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-        if (!pPageObj) {
-            continue;
-        }
-        pPageObj->Release();
+        delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
     }
 }
 void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause)
 {
     if (m_pParser == NULL) {
         return;
     }
     m_pParser->Continue(pPause);
     if (m_pParser->GetStatus() == CPDF_ContentParser::Done) {
         m_ParseState = PDF_CONTENT_PARSED;
@@ skipping 94 matching lines @@
 void CPDF_PageObjects::ClearCacheObjects()
 {
     m_ParseState = PDF_CONTENT_NOT_PARSED;
     if (m_pParser) {
         delete m_pParser;
     }
     m_pParser = NULL;
     if (m_bReleaseMembers) {
         FX_POSITION pos = m_ObjectList.GetHeadPosition();
         while (pos) {
-            CPDF_PageObject* pPageObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-            if (!pPageObj) {
-                continue;
-            }
-            pPageObj->Release();
+            delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
         }
     }
     m_ObjectList.RemoveAll();
 }
 CPDF_Page::CPDF_Page()
 {
     m_pPageRender = NULL;
 }
 void CPDF_Page::Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache)
 {
@@ skipping 205 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;
 }