Merge to XFA: Remove Release() combo patch.

fpdfsdk/src/fsdk_baseform.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/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 #include "../include/fsdk_baseform.h"
 #include "../include/formfiller/FFL_FormFiller.h"
 #include "../include/fsdk_actionhandler.h"
 
 #include "../include/javascript/IJavaScript.h"
@@ skipping 2435 matching lines @@
         return m_pDocument;
 }
 
 FX_BOOL CPDFSDK_InterForm::HighlightWidgets()
 {
         return FALSE;
 }
 
 CPDFSDK_Widget* CPDFSDK_InterForm::GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const
 {
-        ASSERT(pWidget != NULL);
+    nonstd::unique_ptr<CBA_AnnotIterator> pIterator(
+        new CBA_AnnotIterator(pWidget->GetPageView(), "Widget", ""));
 
-        CBA_AnnotIterator* pIterator = new CBA_AnnotIterator(pWidget->GetPageView(), "Widget", "");//XfA?
-        ASSERT(pIterator != NULL);
-
-        CPDFSDK_Widget* pRet = NULL;
-
-        if (bNext)
-                pRet = (CPDFSDK_Widget*)pIterator->GetNextAnnot(pWidget);
-        else
-                pRet = (CPDFSDK_Widget*)pIterator->GetPrevAnnot(pWidget);
-
-        pIterator->Release();
-        
-        return pRet;
-
+    if (bNext) {
+        return (CPDFSDK_Widget*)pIterator->GetNextAnnot(pWidget);
+    }
+    return (CPDFSDK_Widget*)pIterator->GetPrevAnnot(pWidget);
 }
 
 CPDFSDK_Widget* CPDFSDK_InterForm::GetWidget(CPDF_FormControl* pControl) const
 {
         if(!pControl || !m_pInterForm) return NULL;
         
         CPDFSDK_Widget* pWidget = NULL;
         m_Map.Lookup(pControl, pWidget);
 
         if (pWidget) return pWidget;
@@ skipping 1308 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }