Cleanup CFX_PathData.

This CL replaces the array of path points with a vector. Cleaning up the usage
as required.

Change-Id: Ifa386a2c847005fef68af748ebe99c4e08961238
Reviewed-on: https://pdfium-review.googlesource.com/2710
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

2 files changed, 28 insertions, 78 deletions

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 4de89a47de..ff8b676de1 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -148,14 +148,13 @@ void CPDF_PageContentGenerator::ProcessImage(CFX_ByteTextBuf* buf,
 void CPDF_PageContentGenerator::ProcessPath(CFX_ByteTextBuf* buf,
                                             CPDF_PathObject* pPathObj) {
   ProcessGraphics(buf, pPathObj);
-  const FX_PATHPOINT* pPoints = pPathObj->m_Path.GetPoints();
+  auto& pPoints = pPathObj->m_Path.GetPoints();
   if (pPathObj->m_Path.IsRect()) {
     *buf << pPoints[0].m_PointX << " " << pPoints[0].m_PointY << " "
          << (pPoints[2].m_PointX - pPoints[0].m_PointX) << " "
          << (pPoints[2].m_PointY - pPoints[0].m_PointY) << " re";
   } else {
-    int numPoints = pPathObj->m_Path.GetPointCount();
-    for (int i = 0; i < numPoints; i++) {
+    for (size_t i = 0; i < pPoints.size(); i++) {
       if (i > 0)
         *buf << " ";
       *buf << pPoints[i].m_PointX << " " << pPoints[i].m_PointY;
@@ -165,7 +164,7 @@ void CPDF_PageContentGenerator::ProcessPath(CFX_ByteTextBuf* buf,
       } else if (pointType == FXPT_TYPE::LineTo) {
         *buf << " l";
       } else if (pointType == FXPT_TYPE::BezierTo) {
-        if (i + 2 >= numPoints ||
+        if (i + 2 >= pPoints.size() ||
             !pPoints[i].IsTypeAndOpen(FXPT_TYPE::BezierTo) ||
             !pPoints[i + 1].IsTypeAndOpen(FXPT_TYPE::BezierTo) ||
             pPoints[i + 2].m_Type != FXPT_TYPE::BezierTo) {
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index 0a636a1888..42e6e2d843 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -44,6 +44,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) {
   pPathObj->m_Path.AppendRect(10, 5, 13, 30);
   pPathObj->m_FillType = FXFILL_ALTERNATE;
   pPathObj->m_bStroke = true;
+
   auto pTestPage = pdfium::MakeUnique<CPDF_Page>(nullptr, nullptr, false);
   CPDF_PageContentGenerator generator(pTestPage.get());
   CFX_ByteTextBuf buf;
@@ -51,77 +52,33 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) {
   EXPECT_EQ("q 10 5 3 25 re B* Q\n", buf.MakeString());
 
   pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
-  pPathObj->m_Path.SetPointCount(4);
-  FX_PATHPOINT* pPoints = pPathObj->m_Path.GetMutablePoints();
-  pPoints[0].m_PointX = 0;
-  pPoints[0].m_PointY = 0;
-  pPoints[0].m_Type = FXPT_TYPE::MoveTo;
-  pPoints[0].m_CloseFigure = false;
-  pPoints[1].m_PointX = 5.2f;
-  pPoints[1].m_PointY = 0;
-  pPoints[1].m_Type = FXPT_TYPE::LineTo;
-  pPoints[1].m_CloseFigure = false;
-  pPoints[2].m_PointX = 5.2f;
-  pPoints[2].m_PointY = 3.78f;
-  pPoints[2].m_Type = FXPT_TYPE::LineTo;
-  pPoints[2].m_CloseFigure = false;
-  pPoints[3].m_PointX = 0;
-  pPoints[3].m_PointY = 3.78f;
-  pPoints[3].m_Type = FXPT_TYPE::LineTo;
-  pPoints[3].m_CloseFigure = true;
+  pPathObj->m_Path.AppendPoint(0, 0, FXPT_TYPE::MoveTo, false);
+  pPathObj->m_Path.AppendPoint(5.2f, 0, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(5.2f, 3.78f, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(0, 3.78f, FXPT_TYPE::LineTo, true);
   pPathObj->m_FillType = 0;
   pPathObj->m_bStroke = false;
   buf.Clear();
+
   TestProcessPath(&generator, &buf, pPathObj.get());
   EXPECT_EQ("q 0 0 5.2 3.78 re n Q\n", buf.MakeString());
 }
 
 TEST_F(CPDF_PageContentGeneratorTest, ProcessPath) {
   auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
-  pPathObj->m_Path.SetPointCount(10);
-  FX_PATHPOINT* pPoints = pPathObj->m_Path.GetMutablePoints();
-  pPoints[0].m_PointX = 3.102f;
-  pPoints[0].m_PointY = 4.67f;
-  pPoints[0].m_Type = FXPT_TYPE::MoveTo;
-  pPoints[0].m_CloseFigure = false;
-  pPoints[1].m_PointX = 5.45f;
-  pPoints[1].m_PointY = 0.29f;
-  pPoints[1].m_Type = FXPT_TYPE::LineTo;
-  pPoints[1].m_CloseFigure = false;
-  pPoints[2].m_PointX = 4.24f;
-  pPoints[2].m_PointY = 3.15f;
-  pPoints[2].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[2].m_CloseFigure = false;
-  pPoints[3].m_PointX = 4.65f;
-  pPoints[3].m_PointY = 2.98f;
-  pPoints[3].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[3].m_CloseFigure = false;
-  pPoints[4].m_PointX = 3.456f;
-  pPoints[4].m_PointY = 0.24f;
-  pPoints[4].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[4].m_CloseFigure = false;
-  pPoints[5].m_PointX = 10.6f;
-  pPoints[5].m_PointY = 11.15f;
-  pPoints[5].m_Type = FXPT_TYPE::LineTo;
-  pPoints[5].m_CloseFigure = false;
-  pPoints[6].m_PointX = 11;
-  pPoints[6].m_PointY = 12.5f;
-  pPoints[6].m_Type = FXPT_TYPE::LineTo;
-  pPoints[6].m_CloseFigure = false;
-  pPoints[7].m_PointX = 11.46f;
-  pPoints[7].m_PointY = 12.67f;
-  pPoints[7].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[7].m_CloseFigure = false;
-  pPoints[8].m_PointX = 11.84f;
-  pPoints[8].m_PointY = 12.96f;
-  pPoints[8].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[8].m_CloseFigure = false;
-  pPoints[9].m_PointX = 12;
-  pPoints[9].m_PointY = 13.64f;
-  pPoints[9].m_Type = FXPT_TYPE::BezierTo;
-  pPoints[9].m_CloseFigure = true;
+  pPathObj->m_Path.AppendPoint(3.102f, 4.67f, FXPT_TYPE::MoveTo, false);
+  pPathObj->m_Path.AppendPoint(5.45f, 0.29f, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(4.24f, 3.15f, FXPT_TYPE::BezierTo, false);
+  pPathObj->m_Path.AppendPoint(4.65f, 2.98f, FXPT_TYPE::BezierTo, false);
+  pPathObj->m_Path.AppendPoint(3.456f, 0.24f, FXPT_TYPE::BezierTo, false);
+  pPathObj->m_Path.AppendPoint(10.6f, 11.15f, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(11, 12.5f, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(11.46f, 12.67f, FXPT_TYPE::BezierTo, false);
+  pPathObj->m_Path.AppendPoint(11.84f, 12.96f, FXPT_TYPE::BezierTo, false);
+  pPathObj->m_Path.AppendPoint(12, 13.64f, FXPT_TYPE::BezierTo, true);
   pPathObj->m_FillType = FXFILL_WINDING;
   pPathObj->m_bStroke = false;
+
   auto pTestPage = pdfium::MakeUnique<CPDF_Page>(nullptr, nullptr, false);
   CPDF_PageContentGenerator generator(pTestPage.get());
   CFX_ByteTextBuf buf;
@@ -134,29 +91,21 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessPath) {
 
 TEST_F(CPDF_PageContentGeneratorTest, ProcessGraphics) {
   auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
-  pPathObj->m_Path.SetPointCount(3);
-  FX_PATHPOINT* pPoints = pPathObj->m_Path.GetMutablePoints();
-  pPoints[0].m_PointX = 1;
-  pPoints[0].m_PointY = 2;
-  pPoints[0].m_Type = FXPT_TYPE::MoveTo;
-  pPoints[0].m_CloseFigure = false;
-  pPoints[1].m_PointX = 3;
-  pPoints[1].m_PointY = 4;
-  pPoints[1].m_Type = FXPT_TYPE::LineTo;
-  pPoints[1].m_CloseFigure = false;
-  pPoints[2].m_PointX = 5;
-  pPoints[2].m_PointY = 6;
-  pPoints[2].m_Type = FXPT_TYPE::LineTo;
-  pPoints[2].m_CloseFigure = true;
+  pPathObj->m_Path.AppendPoint(1, 2, FXPT_TYPE::MoveTo, false);
+  pPathObj->m_Path.AppendPoint(3, 4, FXPT_TYPE::LineTo, false);
+  pPathObj->m_Path.AppendPoint(5, 6, FXPT_TYPE::LineTo, true);
   pPathObj->m_FillType = FXFILL_WINDING;
   pPathObj->m_bStroke = true;
+
   FX_FLOAT rgb[3] = {0.5f, 0.7f, 0.35f};
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
   pPathObj->m_ColorState.SetFillColor(pCS, rgb, 3);
+
   FX_FLOAT rgb2[3] = {1, 0.9f, 0};
   pPathObj->m_ColorState.SetStrokeColor(pCS, rgb2, 3);
   pPathObj->m_GeneralState.SetFillAlpha(0.5f);
   pPathObj->m_GeneralState.SetStrokeAlpha(0.8f);
+
   auto pDoc = pdfium::MakeUnique<CPDF_Document>(nullptr);
   pDoc->CreateNewDoc();
   CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(0);
@@ -165,6 +114,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessGraphics) {
   CFX_ByteTextBuf buf;
   TestProcessPath(&generator, &buf, pPathObj.get());
   CFX_ByteString pathString = buf.MakeString();
+
   // Color RGB values used are integers divided by 255.
   EXPECT_EQ("q 0.501961 0.701961 0.34902 rg 1 0.901961 0 RG /",
             pathString.Left(48));
@@ -184,6 +134,7 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessGraphics) {
   EXPECT_EQ("q 0.501961 0.701961 0.34902 rg 1 0.901961 0 RG 10.5 w /",
             pathString2.Left(55));
   EXPECT_EQ(" gs 1 2 m 3 4 l 5 6 l h B Q\n", pathString2.Right(28));
+
   // Compare with the previous (should use same dictionary for gs)
   EXPECT_EQ(pathString.GetLength() + 7, pathString2.GetLength());
   EXPECT_EQ(pathString.Mid(48, pathString.GetLength() - 76),