Merge to XFA: Remove Release() combo patch.

fpdfsdk/include/fsdk_baseform.h

 // 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
 
 #ifndef _FSDK_BASEFORM_H_
 #define _FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 315 matching lines @@
         FX_BYTE m_iHighlightAlpha;
         FX_BOOL m_bNeedHightlight[7];
 };
 
 #define BAI_STRUCTURE           0
 #define BAI_ROW                         1
 #define BAI_COLUMN                      2
 
 #define CPDFSDK_Annots                          CFX_ArrayTemplate<CPDFSDK_Annot*>
 #define CPDFSDK_SortAnnots                      CGW_ArrayTemplate<CPDFSDK_Annot*>
-class CBA_AnnotIterator 
+class CBA_AnnotIterator
 {
 public:
         CBA_AnnotIterator(CPDFSDK_PageView* pPageView, const CFX_ByteString& sType, const CFX_ByteString& sSubType);
-        virtual ~CBA_AnnotIterator();
-        
-        virtual CPDFSDK_Annot*                          GetFirstAnnot();
-        virtual CPDFSDK_Annot*                          GetLastAnnot();
-        virtual CPDFSDK_Annot*                          GetNextAnnot(CPDFSDK_Annot* pAnnot);
-        virtual CPDFSDK_Annot*                          GetPrevAnnot(CPDFSDK_Annot* pAnnot);
-        
-        virtual void                                            Release(){delete this;}
-        
+        ~CBA_AnnotIterator();
+
+        CPDFSDK_Annot*                          GetFirstAnnot();
+        CPDFSDK_Annot*                          GetLastAnnot();
+        CPDFSDK_Annot*                          GetNextAnnot(CPDFSDK_Annot* pAnnot);
+        CPDFSDK_Annot*                          GetPrevAnnot(CPDFSDK_Annot* pAnnot);
+
 private:
         void                                                            GenerateResults();
         static int                                                      CompareByLeft(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
         static int                                                      CompareByTop(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
-        
         static CPDF_Rect                                        GetAnnotRect(CPDFSDK_Annot* pAnnot);
-        
-private:
+
         CPDFSDK_PageView*                                       m_pPageView;
         CFX_ByteString                                          m_sType;
         CFX_ByteString                                          m_sSubType;
         int                                                                     m_nTabs;
-        
         CPDFSDK_Annots                                          m_Annots;
 };
 
 #endif //#define _FSDK_BASEFORM_H_