Merge to XFA: Remove Release() combo patch.

core/src/fpdfdoc/doc_annot.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 "../../../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);
     m_pPageDict = pPage->m_pFormDict;
     if (m_pPageDict == NULL) {
         return;
     }
     m_pDocument = pPage->m_pDocument;
     CPDF_Array* pAnnots = m_pPageDict->GetArray("Annots");
     if (pAnnots == NULL) {
@@ skipping 297 matching lines @@
         return NULL;
     }
     CPDF_Array* pColor = m_pAnnotDict->GetArray("C");
     FX_DWORD argb = 0xff000000;
     if (pColor != NULL) {
         int R = (FX_INT32)(pColor->GetNumber(0) * 255);
         int G = (FX_INT32)(pColor->GetNumber(1) * 255);
         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<CPDF_PathObject> 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;
     pPathObject->m_bStroke = TRUE;
     pPathObject->m_FillType = 0;
     if (style_char == 'D') {
         if (pDashArray) {
             FX_DWORD dash_count = pDashArray->GetCount();
             if (dash_count % 2) {
                 dash_count ++;
             }
             pGraphState->m_DashArray = FX_Alloc(FX_FLOAT, dash_count);
             if (pGraphState->m_DashArray == NULL) {
-                pPathObject->Release();
                 return NULL;
             }
             pGraphState->m_DashCount = dash_count;
             FX_DWORD i;
             for (i = 0; i < pDashArray->GetCount(); i ++) {
                 pGraphState->m_DashArray[i] = pDashArray->GetNumber(i);
             }
             if (i < dash_count) {
                 pGraphState->m_DashArray[i] = pGraphState->m_DashArray[i - 1];
             }
         } else {
             pGraphState->m_DashArray = FX_Alloc(FX_FLOAT, 2);
             if (pGraphState->m_DashArray == NULL) {
-                pPathObject->Release();
                 return NULL;
             }
             pGraphState->m_DashCount = 2;
             pGraphState->m_DashArray[0] = pGraphState->m_DashArray[1] = 3 * 1.0f;
         }
     }
     CFX_FloatRect rect;
     GetRect(rect);
     width /= 2;
     CPDF_PathData *pPathData = pPathObject->m_Path.GetModify();
     if (pPathData) {
         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)
 {
     if (GetSubType() == "Popup") {
         return;
     }
     FX_DWORD annot_flags = GetFlags();
     if (annot_flags & ANNOTFLAG_HIDDEN) {
         return;
     }
@@ skipping 119 matching lines @@
         if (pIRT != m_pAnnotDict) {
             continue;
         }
         if (count == index) {
             return pAnnot;
         }
         count ++;
     }
     return NULL;
 }