Make CPDF_Path have a CFX_Path rather than inheriting

core/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 "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <memory>
 #include <utility>
@@ skipping 1441 matching lines @@
 }
 
 void CPDF_StreamContentParser::AddPathObject(int FillType, FX_BOOL bStroke) {
   int PathPointCount = m_PathPointCount;
   uint8_t PathClipType = m_PathClipType;
   m_PathPointCount = 0;
   m_PathClipType = 0;
   if (PathPointCount <= 1) {
     if (PathPointCount && PathClipType) {
       CPDF_Path path;
-      path.Emplace()->AppendRect(0, 0, 0, 0);
+      path.AppendRect(0, 0, 0, 0);
       m_pCurStates->m_ClipPath.AppendPath(path, FXFILL_WINDING, TRUE);
     }
     return;
   }
   if (PathPointCount &&
       m_pPathPoints[PathPointCount - 1].m_Flag == FXPT_MOVETO) {
     PathPointCount--;
   }
   CPDF_Path Path;
-  CFX_PathData* pPathData = Path.Emplace();
-  pPathData->SetPointCount(PathPointCount);
-  FXSYS_memcpy(pPathData->GetPoints(), m_pPathPoints,
+  Path.SetPointCount(PathPointCount);
+  FXSYS_memcpy(Path.GetMutablePoints(), m_pPathPoints,
                sizeof(FX_PATHPOINT) * PathPointCount);
   CFX_Matrix matrix = m_pCurStates->m_CTM;
   matrix.Concat(m_mtContentToUser);
   if (bStroke || FillType) {
     std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject);
     pPathObj->m_bStroke = bStroke;
     pPathObj->m_FillType = FillType;
     pPathObj->m_Path = Path;
     pPathObj->m_Matrix = matrix;
     SetGraphicStates(pPathObj.get(), TRUE, FALSE, TRUE);
@@ skipping 188 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }