Merge to XFA: Remove Release() combo patch.

fpdfsdk/src/fxedit/fxet_edit.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/fxedit/fxet_stub.h"
 #include "../../include/fxedit/fxet_edit.h"
 
 #define FX_EDIT_UNDO_MAXITEM                            10000
@@ skipping 435 matching lines @@
         if (nIndex>=0 && nIndex < m_UndoItemStack.GetSize())
                 return m_UndoItemStack.GetAt(nIndex);
 
         return NULL;
 }
 
 void CFX_Edit_Undo::RemoveHeads()
 {
         ASSERT(m_UndoItemStack.GetSize() > 1);
 
-        IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(0);
-        ASSERT(pItem != NULL);
-
-        pItem->Release();
+        delete m_UndoItemStack.GetAt(0);
         m_UndoItemStack.RemoveAt(0);
 }
 
 void CFX_Edit_Undo::RemoveTails()
 {
         for (FX_INT32 i = m_UndoItemStack.GetSize()-1; i >= m_nCurUndoPos; i--)
         {
-                IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(i);
-                ASSERT(pItem != NULL);
-
-                pItem->Release();
+                delete m_UndoItemStack.GetAt(i);
                 m_UndoItemStack.RemoveAt(i);
         }
 }
 
 void CFX_Edit_Undo::Reset()
 {
         for (FX_INT32 i=0, sz=m_UndoItemStack.GetSize(); i < sz; i++)
         {
-                IFX_Edit_UndoItem * pItem = m_UndoItemStack.GetAt(i);
-                ASSERT(pItem != NULL);
-
-                pItem->Release();
+                delete m_UndoItemStack.GetAt(i);
         }
         m_nCurUndoPos = 0;
         m_UndoItemStack.RemoveAll();
 }
 
 /* -------------------------------- CFX_Edit_GroupUndoItem -------------------------------- */
 
 CFX_Edit_GroupUndoItem::CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle) : m_sTitle(sTitle)
 {
 }
 
 CFX_Edit_GroupUndoItem::~CFX_Edit_GroupUndoItem()
 {
         for (int i=0,sz=m_Items.GetSize(); i<sz; i++)
         {
-                CFX_Edit_UndoItem* pUndoItem = m_Items[i];
-                ASSERT(pUndoItem != NULL);
-
-                pUndoItem->Release();
+                delete m_Items[i];
         }
 
         m_Items.RemoveAll();
 }
 
 void CFX_Edit_GroupUndoItem::AddUndoItem(CFX_Edit_UndoItem* pUndoItem)
 {
         ASSERT(pUndoItem != NULL);
 
         pUndoItem->SetFirst(FALSE);
@@ skipping 39 matching lines @@
 
                 pUndoItem->Redo();
         }
 }
 
 CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle()
 {
         return m_sTitle;
 }
 
-void CFX_Edit_GroupUndoItem::Release()
-{
-        delete this;
-}
-
 /* ------------------------------------- CFX_Edit_UndoItem derived classes ------------------------------------- */
 
 CFXEU_InsertWord::CFXEU_InsertWord(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace,
                                                                  FX_WORD word, FX_INT32 charset, const CPVT_WordProps * pWordProps) 
         : m_pEdit(pEdit), m_wpOld(wpOldPlace), m_wpNew(wpNewPlace), m_Word(word), m_nCharset(charset), m_WordProps()
 {
         if (pWordProps)
                 m_WordProps = *pWordProps;
 }
 
@@ skipping 3025 matching lines @@
         }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem)
 {
         m_Undo.AddItem(pUndoItem);
         if (m_bOprNotify && m_pOprNotify)
                 m_pOprNotify->OnAddUndo(pUndoItem);
 }