From ced4c2bf1d0d1bab14a6145b35b3baecb175a691 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 20 Apr 2015 16:33:30 -0700 Subject: Merge to XFA: Remove Release() combo patch. Includes: Original Review URL: https://codereview.chromium.org/1098043002 Original Review URL: https://codereview.chromium.org/1097843003 Original Review URL: https://codereview.chromium.org/1093213002 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1092033004 --- core/include/fpdfapi/fpdf_pageobj.h | 5 +---- core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 19 +++++-------------- core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | 3 +-- core/src/fpdfdoc/doc_annot.cpp | 13 ++++--------- 4 files changed, 11 insertions(+), 29 deletions(-) (limited to 'core') diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index bd11a209f0..e78c9bb8b2 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -455,10 +455,8 @@ public: class CPDF_PageObject : public CPDF_GraphicStates { public: - static CPDF_PageObject* Create(int type); - - void Release(); + virtual ~CPDF_PageObject(); CPDF_PageObject* Clone() const; @@ -505,7 +503,6 @@ protected: CPDF_PageObject() {} - virtual ~CPDF_PageObject() {} }; struct CPDF_TextObjectItem { diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index ccdfb9fcbb..c9b17054a8 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -7,10 +7,6 @@ #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) { @@ -27,6 +23,9 @@ CPDF_PageObject* CPDF_PageObject::Create(int type) } return NULL; } +CPDF_PageObject::~CPDF_PageObject() +{ +} CPDF_PageObject* CPDF_PageObject::Clone() const { CPDF_PageObject* pObj = Create(m_Type); @@ -689,11 +688,7 @@ CPDF_PageObjects::~CPDF_PageObjects() } 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) @@ -808,11 +803,7 @@ void CPDF_PageObjects::ClearCacheObjects() 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(); diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index 559d8500b1..612b0e3716 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -192,8 +192,7 @@ void CPDF_ClipPath::AppendTexts(CPDF_TextObject** pTexts, int count) CPDF_ClipPathData* pData = GetModify(); if (pData->m_TextCount + count > FPDF_CLIPPATH_MAX_TEXTS) { for (int i = 0; i < count; i ++) { - if (pTexts[i]) - pTexts[i]->Release(); + delete pTexts[i]; } return; } diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index 8952845570..3285487ca0 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfdoc/fpdf_doc.h" #include "../../include/fpdfapi/fpdf_pageobj.h" + CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) { ASSERT(pPage != NULL); @@ -323,19 +325,14 @@ CPDF_PageObject* CPDF_Annot::GetBorder(FX_BOOL bPrint, const CPDF_RenderOptions* int B = (FX_INT32)(pColor->GetNumber(2) * 255); argb = ArgbEncode(0xff, R, G, B); } - CPDF_PathObject *pPathObject = FX_NEW CPDF_PathObject(); - if (!pPathObject) { - return NULL; - } + nonstd::unique_ptr pPathObject(new CPDF_PathObject()); CPDF_GraphStateData *pGraphState = pPathObject->m_GraphState.GetModify(); if (!pGraphState) { - pPathObject->Release(); return NULL; } pGraphState->m_LineWidth = width; CPDF_ColorStateData *pColorData = pPathObject->m_ColorState.GetModify(); if (!pColorData) { - pPathObject->Release(); return NULL; } pColorData->m_StrokeRGB = argb; @@ -349,7 +346,6 @@ CPDF_PageObject* CPDF_Annot::GetBorder(FX_BOOL bPrint, const CPDF_RenderOptions* } pGraphState->m_DashArray = FX_Alloc(FX_FLOAT, dash_count); if (pGraphState->m_DashArray == NULL) { - pPathObject->Release(); return NULL; } pGraphState->m_DashCount = dash_count; @@ -363,7 +359,6 @@ CPDF_PageObject* CPDF_Annot::GetBorder(FX_BOOL bPrint, const CPDF_RenderOptions* } else { pGraphState->m_DashArray = FX_Alloc(FX_FLOAT, 2); if (pGraphState->m_DashArray == NULL) { - pPathObject->Release(); return NULL; } pGraphState->m_DashCount = 2; @@ -378,7 +373,7 @@ CPDF_PageObject* CPDF_Annot::GetBorder(FX_BOOL bPrint, const CPDF_RenderOptions* pPathData->AppendRect(rect.left + width, rect.bottom + width, rect.right - width, rect.top - width); } pPathObject->CalcBoundingBox(); - return pPathObject; + return pPathObject.release(); } void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device, const CPDF_RenderOptions* pOptions) { -- cgit v1.2.3