1 files changed, 8 insertions, 8 deletions

diff --git a/xfa/fxfa/app/cxfa_fffield.cpp b/xfa/fxfa/app/cxfa_fffield.cpp
index 09773b6737..bf98b99a8e 100644
--- a/xfa/fxfa/app/cxfa_fffield.cpp
+++ b/xfa/fxfa/app/cxfa_fffield.cpp
@@ -23,8 +23,8 @@
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
-#include "xfa/fxgraphics/cfx_path.h"
 #include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_path.h"
 
 namespace {
 
@@ -57,7 +57,7 @@ CFX_RectF CXFA_FFField::GetBBox(uint32_t dwStatus, bool bDrawFocus) {
   return rtBox;
 }
 
-void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS,
                                 CFX_Matrix* pMatrix,
                                 uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -80,7 +80,7 @@ void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
                                                  &mt);
 }
 
-void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
+void CXFA_FFField::DrawHighlight(CXFA_Graphics* pGS,
                                  CFX_Matrix* pMatrix,
                                  uint32_t dwStatus,
                                  bool bEllipse) {
@@ -95,7 +95,7 @@ void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
   CXFA_FFDoc* pDoc = GetDoc();
   CXFA_Color crHighlight(pDoc->GetDocEnvironment()->GetHighlightColor(pDoc));
   pGS->SetFillColor(&crHighlight);
-  CFX_Path path;
+  CXFA_Path path;
   if (bEllipse)
     path.AddEllipse(m_rtUI);
   else
@@ -104,7 +104,7 @@ void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
   pGS->FillPath(&path, FXFILL_WINDING, pMatrix);
 }
 
-void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
+void CXFA_FFField::DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
   if (!(m_dwStatus & XFA_WidgetStatus_Focused))
     return;
 
@@ -115,7 +115,7 @@ void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
   pGS->SetLineDash(0.0f, DashPattern, 2);
   pGS->SetLineWidth(0, false);
 
-  CFX_Path path;
+  CXFA_Path path;
   path.AddRectangle(m_rtUI.left, m_rtUI.top, m_rtUI.width, m_rtUI.height);
   pGS->StrokePath(&path, pMatrix);
 }
@@ -605,7 +605,7 @@ void CXFA_FFField::LayoutCaption() {
     m_rtCaption.height = fHeight;
 }
 
-void CXFA_FFField::RenderCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
+void CXFA_FFField::RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
   CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout();
   if (!pCapTextLayout)
     return;
@@ -781,5 +781,5 @@ void CXFA_FFField::OnProcessEvent(CFWL_Event* pEvent) {
   }
 }
 
-void CXFA_FFField::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFField::OnDrawWidget(CXFA_Graphics* pGraphics,
                                 const CFX_Matrix* pMatrix) {}