Replace CXFA_StrokeArray and CXFA_WidgetArray with std::vector

xfa/fxfa/parser/cxfa_box.cpp

 // Copyright 2016 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 "xfa/fxfa/parser/cxfa_box.h"
 
 #include "xfa/fxfa/parser/cxfa_corner.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 
 namespace {
 
 void GetStrokesInternal(CXFA_Node* pNode,
-                        CXFA_StrokeArray& strokes,
+                        std::vector<CXFA_Stroke>* strokes,
                         bool bNull) {
-  strokes.RemoveAll();
+  strokes->clear();
   if (!pNode)
     return;
 
-  strokes.SetSize(8);
+  strokes->resize(8);
   int32_t i, j;
   for (i = 0, j = 0; i < 4; i++) {
     CXFA_Corner corner =
         CXFA_Corner(pNode->GetProperty(i, XFA_Element::Corner, i == 0));
     if (corner || i == 0)
-      strokes.SetAt(j, corner);
+      (*strokes)[j] = corner;
     else if (bNull)
-      strokes.SetAt(j, CXFA_Stroke(nullptr));
-    else if (i == 1)
-      strokes.SetAt(j, strokes[0]);
-    else if (i == 2)
-      strokes.SetAt(j, strokes[0]);
+      (*strokes)[j] = CXFA_Stroke(nullptr);

[npm, 2017/01/23 14:49:50]

Now this can be CXFA_Stroke(), right?

[Tom Sepez, 2017/01/23 18:36:51]

Actually, now that I added the default ctor, the resize above takes care of this
for us and we're storing a null stroke on top of a null stroke.
Fixed logic.

[npm, 2017/01/23 18:51:51]

Acknowledged.

+    else if (i == 1 || i == 2)
+      (*strokes)[j] = (*strokes)[0];
     else
-      strokes.SetAt(j, strokes[2]);
+      (*strokes)[j] = (*strokes)[2];
 
     j++;
     CXFA_Edge edge =
         CXFA_Edge(pNode->GetProperty(i, XFA_Element::Edge, i == 0));
     if (edge || i == 0)
-      strokes.SetAt(j, edge);
+      (*strokes)[j] = edge;
     else if (bNull)
-      strokes.SetAt(j, CXFA_Stroke(nullptr));
-    else if (i == 1)
-      strokes.SetAt(j, strokes[1]);
-    else if (i == 2)
-      strokes.SetAt(j, strokes[1]);
+      (*strokes)[j] = CXFA_Stroke(nullptr);

[npm, 2017/01/23 14:49:50]

ditto

[Tom Sepez, 2017/01/23 18:36:51]

ditto

[npm, 2017/01/23 18:51:51]

Acknowledged.

+    else if (i == 1 || i == 2)
+      (*strokes)[j] = (*strokes)[1];
     else
-      strokes.SetAt(j, strokes[3]);
+      (*strokes)[j] = (*strokes)[3];
 
     j++;
   }
 }
 
-static int32_t Style3D(const CXFA_StrokeArray& strokes, CXFA_Stroke& stroke) {
-  int32_t iCount = strokes.GetSize();
-  if (iCount < 1)
+static int32_t Style3D(const std::vector<CXFA_Stroke>& strokes,
+                       CXFA_Stroke& stroke) {
+  if (strokes.empty())
     return 0;
 
   stroke = strokes[0];
-  for (int32_t i = 1; i < iCount; i++) {
+  for (size_t i = 1; i < strokes.size(); i++) {
     CXFA_Stroke find = strokes[i];
     if (!find)
       continue;
 
     if (!stroke)
       stroke = find;
     else if (stroke.GetStrokeType() != find.GetStrokeType())
       stroke = find;
     break;
   }
@@ skipping 25 matching lines @@
     return 0;
   return m_pNode->CountChildren(XFA_Element::Edge);
 }
 
 CXFA_Edge CXFA_Box::GetEdge(int32_t nIndex) const {
   return CXFA_Edge(
       m_pNode ? m_pNode->GetProperty(nIndex, XFA_Element::Edge, nIndex == 0)
               : nullptr);
 }
 
-void CXFA_Box::GetStrokes(CXFA_StrokeArray& strokes) const {
+void CXFA_Box::GetStrokes(std::vector<CXFA_Stroke>* strokes) const {
   GetStrokesInternal(m_pNode, strokes, false);
 }
 
 bool CXFA_Box::IsCircular() const {
   if (!m_pNode)
     return false;
   return m_pNode->GetBoolean(XFA_ATTRIBUTE_Circular);
 }
 
 bool CXFA_Box::GetStartAngle(FX_FLOAT& fStartAngle) const {
@@ skipping 32 matching lines @@
 
 CXFA_Margin CXFA_Box::GetMargin() const {
   return CXFA_Margin(m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin)
                              : nullptr);
 }
 
 int32_t CXFA_Box::Get3DStyle(bool& bVisible, FX_FLOAT& fThickness) const {
   if (IsArc())
     return 0;
 
-  CXFA_StrokeArray strokes;
-  GetStrokesInternal(m_pNode, strokes, true);
+  std::vector<CXFA_Stroke> strokes;
+  GetStrokesInternal(m_pNode, &strokes, true);
   CXFA_Stroke stroke(nullptr);
   int32_t iType = Style3D(strokes, stroke);
   if (iType) {
     bVisible = stroke.IsVisible();
     fThickness = stroke.GetThickness();
   }
   return iType;
 }