Merge to XFA: Get rid of most uses of CFX_PtrArray.

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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 "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 62 matching lines @@
     m_pCurStates->m_ColorState.New();
   }
   for (size_t i = 0; i < FX_ArraySize(m_Type3Data); ++i) {
     m_Type3Data[i] = 0.0;
   }
 }
 
 CPDF_StreamContentParser::~CPDF_StreamContentParser() {
   ClearAllParams();
   for (int i = 0; i < m_StateStack.GetSize(); ++i) {
-    delete (CPDF_AllStates*)m_StateStack[i];
+    delete m_StateStack[i];
   }
   FX_Free(m_pPathPoints);
   if (m_pLastImageDict) {
     m_pLastImageDict->Release();
   }
   if (m_pLastCloneImageDict) {
     m_pLastCloneImageDict->Release();
   }
 }
 int CPDF_StreamContentParser::GetNextParamPos() {
@@ skipping 718 matching lines @@
   }
   m_CurContentMark.GetModify()->DeleteLastMark();
 }
 void CPDF_StreamContentParser::Handle_EndText() {
   int count = m_ClipTextList.GetSize();
   if (count == 0) {
     return;
   }
   if (m_pCurStates->m_TextState.GetObject()->m_TextMode < 4) {
     for (int i = 0; i < count; i++) {
-      CPDF_TextObject* pText = (CPDF_TextObject*)m_ClipTextList.GetAt(i);
-      delete pText;
+      delete m_ClipTextList.GetAt(i);
     }
   } else {
-    m_pCurStates->m_ClipPath.AppendTexts(
-        (CPDF_TextObject**)m_ClipTextList.GetData(), count);
+    m_pCurStates->m_ClipPath.AppendTexts(m_ClipTextList.GetData(), count);
   }
   m_ClipTextList.RemoveAll();
 }
 void CPDF_StreamContentParser::Handle_EndSectionUndefined() {
   if (m_CompatCount) {
     m_CompatCount--;
   }
 }
 void CPDF_StreamContentParser::Handle_FillPath() {
   if (m_Options.m_bTextOnly) {
@@ skipping 105 matching lines @@
 void CPDF_StreamContentParser::Handle_SaveGraphState() {
   CPDF_AllStates* pStates = new CPDF_AllStates;
   pStates->Copy(*m_pCurStates);
   m_StateStack.Add(pStates);
 }
 void CPDF_StreamContentParser::Handle_RestoreGraphState() {
   int size = m_StateStack.GetSize();
   if (size == 0) {
     return;
   }
-  CPDF_AllStates* pStates = (CPDF_AllStates*)m_StateStack.GetAt(size - 1);
+  CPDF_AllStates* pStates = m_StateStack.GetAt(size - 1);
   m_pCurStates->Copy(*pStates);
   delete pStates;
   m_StateStack.RemoveAt(size - 1);
 }
 void CPDF_StreamContentParser::Handle_Rectangle() {
   if (m_Options.m_bTextOnly) {
     return;
   }
   FX_FLOAT x = GetNumber(3), y = GetNumber(2);
   FX_FLOAT w = GetNumber(1), h = GetNumber(0);
@@ skipping 562 matching lines @@
     m_pObjectList->m_ObjectList.AddTail(pPathObj);
   }
   if (PathClipType) {
     if (!matrix.IsIdentity()) {
       Path.Transform(&matrix);
       matrix.SetIdentity();
     }
     m_pCurStates->m_ClipPath.AppendPath(Path, PathClipType, TRUE);
   }
 }