Remove CFX_PtrList from renderer main loop.

fpdfsdk/src/fxedit/fxet_pageobjs.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 "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "fpdfsdk/include/fx_systemhandler.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
@@ skipping 391 matching lines @@
             pDevice, CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
             pFontMap->GetPDFFont(wp.nFontIndex), wp.fFontSize, pUser2Device,
             sTextBuf.GetByteString(), crOld, 0, wp.nHorzScale);
       }
     }
   }
 
   pDevice->RestoreState();
 }
 
-static void AddRectToPageObjects(CPDF_PageObjectHolder* pPageObjs,
+static void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder,
                                  FX_COLORREF crFill,
                                  const CPDF_Rect& rcFill) {
-  CPDF_PathObject* pPathObj = new CPDF_PathObject;
+  std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject);
   CPDF_PathData* pPathData = pPathObj->m_Path.GetModify();
   pPathData->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, rcFill.top);
 
   FX_FLOAT rgb[3];
   rgb[0] = FXARGB_R(crFill) / 255.0f;
   rgb[1] = FXARGB_G(crFill) / 255.0f;
   rgb[2] = FXARGB_B(crFill) / 255.0f;
   pPathObj->m_ColorState.SetFillColor(
       CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3);
 
   pPathObj->m_FillType = FXFILL_ALTERNATE;
   pPathObj->m_bStroke = FALSE;
-  pPageObjs->GetPageObjectList()->InsertObject(
-      pPageObjs->GetPageObjectList()->GetTailPosition(), pPathObj);
+  pObjectHolder->GetPageObjectList()->push_back(std::move(pPathObj));
 }
 
 static CPDF_TextObject* AddTextObjToPageObjects(
-    CPDF_PageObjectHolder* pPageObjs,
+    CPDF_PageObjectHolder* pObjectHolder,
     FX_COLORREF crText,
     CPDF_Font* pFont,
     FX_FLOAT fFontSize,
     FX_FLOAT fCharSpace,
     int32_t nHorzScale,
     const CPDF_Point& point,
     const CFX_ByteString& text) {
-  CPDF_TextObject* pTxtObj = new CPDF_TextObject;
-
+  std::unique_ptr<CPDF_TextObject> pTxtObj(new CPDF_TextObject);
   CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetModify();
   pTextStateData->m_pFont = pFont;
   pTextStateData->m_FontSize = fFontSize;
   pTextStateData->m_CharSpace = fCharSpace;
   pTextStateData->m_WordSpace = 0;
   pTextStateData->m_TextMode = 0;
   pTextStateData->m_Matrix[0] = nHorzScale / 100.0f;
   pTextStateData->m_Matrix[1] = 0;
   pTextStateData->m_Matrix[2] = 0;
   pTextStateData->m_Matrix[3] = 1;
 
   FX_FLOAT rgb[3];
   rgb[0] = FXARGB_R(crText) / 255.0f;
   rgb[1] = FXARGB_G(crText) / 255.0f;
   rgb[2] = FXARGB_B(crText) / 255.0f;
   pTxtObj->m_ColorState.SetFillColor(
       CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3);
   pTxtObj->m_ColorState.SetStrokeColor(
       CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3);
 
   pTxtObj->SetPosition(point.x, point.y);
   pTxtObj->SetText(text);
-  pPageObjs->GetPageObjectList()->InsertObject(
-      pPageObjs->GetPageObjectList()->GetTailPosition(), pTxtObj);
 
-  return pTxtObj;
+  CPDF_TextObject* pRet = pTxtObj.get();
+  pObjectHolder->GetPageObjectList()->push_back(std::move(pTxtObj));
+  return pRet;
 }
 
 void IFX_Edit::GeneratePageObjects(
-    CPDF_PageObjectHolder* pPageObjects,
+    CPDF_PageObjectHolder* pObjectHolder,
     IFX_Edit* pEdit,
     const CPDF_Point& ptOffset,
     const CPVT_WordRange* pRange,
     FX_COLORREF crText,
     CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
   FX_FLOAT fFontSize = pEdit->GetFontSize();
 
   int32_t nOldFontIndex = -1;
 
   CFX_ByteTextBuf sTextBuf;
@@ skipping 14 matching lines @@
         CPVT_WordPlace place = pIterator->GetAt();
         if (pRange && place.WordCmp(pRange->EndPos) > 0)
           break;
 
         CPVT_Word word;
         if (pIterator->GetWord(word)) {
           if (place.LineCmp(oldplace) != 0 ||
               nOldFontIndex != word.nFontIndex) {
             if (sTextBuf.GetLength() > 0) {
               ObjArray.Add(AddTextObjToPageObjects(
-                  pPageObjects, crText, pFontMap->GetPDFFont(nOldFontIndex),
+                  pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
                   fFontSize, 0.0f, 100,
                   CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
                   sTextBuf.GetByteString()));
 
               sTextBuf.Clear();
             }
 
             ptBT = word.ptWord;
             nOldFontIndex = word.nFontIndex;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0);
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         ObjArray.Add(AddTextObjToPageObjects(
-            pPageObjects, crText, pFontMap->GetPDFFont(nOldFontIndex),
+            pObjectHolder, crText, pFontMap->GetPDFFont(nOldFontIndex),
             fFontSize, 0.0f, 100,
             CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
             sTextBuf.GetByteString()));
       }
     }
   }
 }
 
 void IFX_Edit::GenerateRichPageObjects(
-    CPDF_PageObjectHolder* pPageObjects,
+    CPDF_PageObjectHolder* pObjectHolder,
     IFX_Edit* pEdit,
     const CPDF_Point& ptOffset,
     const CPVT_WordRange* pRange,
     CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
   FX_COLORREF crCurText = ArgbEncode(255, 0, 0, 0);
   FX_COLORREF crOld = crCurText;
 
   CFX_ByteTextBuf sTextBuf;
   CPVT_WordProps wp;
   CPDF_Point ptBT(0.0f, 0.0f);
@@ skipping 20 matching lines @@
 
           crCurText = ArgbEncode(255, word.WordProps.dwWordColor);
 
           if (place.LineCmp(oldplace) != 0 ||
               word.WordProps.fCharSpace > 0.0f ||
               word.WordProps.nHorzScale != 100 ||
               FXSYS_memcmp(&word.WordProps, &wp, sizeof(CPVT_WordProps)) != 0 ||
               crOld != crCurText) {
             if (sTextBuf.GetLength() > 0) {
               ObjArray.Add(AddTextObjToPageObjects(
-                  pPageObjects, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
+                  pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
                   wp.fFontSize, wp.fCharSpace, wp.nHorzScale,
                   CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
                   sTextBuf.GetByteString()));
 
               sTextBuf.Clear();
             }
 
             wp = word.WordProps;
             ptBT = word.ptWord;
             crOld = crCurText;
           }
 
           sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex,
                                        word.Word, 0);
 
           if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) {
             CPDF_Rect rcUnderline = GetUnderLineRect(word);
             rcUnderline.left += ptOffset.x;
             rcUnderline.right += ptOffset.x;
             rcUnderline.top += ptOffset.y;
             rcUnderline.bottom += ptOffset.y;
 
-            AddRectToPageObjects(pPageObjects, crCurText, rcUnderline);
+            AddRectToPageObjects(pObjectHolder, crCurText, rcUnderline);
           }
 
           if (word.WordProps.nWordStyle & PVTWORD_STYLE_CROSSOUT) {
             CPDF_Rect rcCrossout = GetCrossoutRect(word);
             rcCrossout.left += ptOffset.x;
             rcCrossout.right += ptOffset.x;
             rcCrossout.top += ptOffset.y;
             rcCrossout.bottom += ptOffset.y;
 
-            AddRectToPageObjects(pPageObjects, crCurText, rcCrossout);
+            AddRectToPageObjects(pObjectHolder, crCurText, rcCrossout);
           }
 
           oldplace = place;
         }
       }
 
       if (sTextBuf.GetLength() > 0) {
         ObjArray.Add(AddTextObjToPageObjects(
-            pPageObjects, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
+            pObjectHolder, crOld, pFontMap->GetPDFFont(wp.nFontIndex),
             wp.fFontSize, wp.fCharSpace, wp.nHorzScale,
             CPDF_Point(ptBT.x + ptOffset.x, ptBT.y + ptOffset.y),
             sTextBuf.GetByteString()));
       }
     }
   }
 }
 
-void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectHolder* pPageObjects,
+void IFX_Edit::GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder,
                                         IFX_Edit* pEdit,
                                         const CPDF_Point& ptOffset,
                                         const CPVT_WordRange* pRange,
                                         FX_COLORREF color) {
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
     if (pEdit->GetFontMap()) {
       if (pRange)
         pIterator->SetAt(pRange->BeginPos);
       else
         pIterator->SetAt(0);
 
       CPVT_WordPlace oldplace;
 
       while (pIterator->NextWord()) {
         CPVT_WordPlace place = pIterator->GetAt();
         if (pRange && place.WordCmp(pRange->EndPos) > 0)
           break;
 
         CPVT_Word word;
         if (pIterator->GetWord(word)) {
           CPDF_Rect rcUnderline = GetUnderLineRect(word);
           rcUnderline.left += ptOffset.x;
           rcUnderline.right += ptOffset.x;
           rcUnderline.top += ptOffset.y;
           rcUnderline.bottom += ptOffset.y;
-          AddRectToPageObjects(pPageObjects, color, rcUnderline);
+          AddRectToPageObjects(pObjectHolder, color, rcUnderline);
         }
       }
     }
   }
 }