Fixup naming of XFA graphics classes

These files were originally renamed thinking they'd move with the
colour class up to core/. It was decided that CPWL_Color was a better
core colour class the the xfa colour so these are being renamed back to
XFA based names to make it clear where they live.

Change-Id: Ie89f2306be0609add29bd445e719567e7b439211
Reviewed-on: https://pdfium-review.googlesource.com/7754
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

38 files changed, 113 insertions, 113 deletions

diff --git a/xfa/fxfa/app/cxfa_ffarc.cpp b/xfa/fxfa/app/cxfa_ffarc.cpp
index e2085480a5..1a12fb5f23 100644
--- a/xfa/fxfa/app/cxfa_ffarc.cpp
+++ b/xfa/fxfa/app/cxfa_ffarc.cpp
@@ -10,7 +10,7 @@ CXFA_FFArc::CXFA_FFArc(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
 
 CXFA_FFArc::~CXFA_FFArc() {}
 
-void CXFA_FFArc::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS,
                               CFX_Matrix* pMatrix,
                               uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffarc.h b/xfa/fxfa/app/cxfa_ffarc.h
index 777ed6f3af..f1bc82f1d2 100644
--- a/xfa/fxfa/app/cxfa_ffarc.h
+++ b/xfa/fxfa/app/cxfa_ffarc.h
@@ -15,7 +15,7 @@ class CXFA_FFArc : public CXFA_FFDraw {
   ~CXFA_FFArc() override;
 
   // CXFA_FFWidget
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
 };
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.cpp b/xfa/fxfa/app/cxfa_ffbarcode.cpp
index bd529d3eb2..7bbb60dd77 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/cxfa_ffbarcode.cpp
@@ -137,7 +137,7 @@ bool CXFA_FFBarcode::LoadWidget() {
   return CXFA_FFField::LoadWidget();
 }
 
-void CXFA_FFBarcode::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFBarcode::RenderWidget(CXFA_Graphics* pGS,
                                   CFX_Matrix* pMatrix,
                                   uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.h b/xfa/fxfa/app/cxfa_ffbarcode.h
index 11b678d98a..782aec39a1 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.h
+++ b/xfa/fxfa/app/cxfa_ffbarcode.h
@@ -92,7 +92,7 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit {
 
   // CXFA_FFTextEdit
   bool LoadWidget() override;
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   void UpdateWidgetProperty() override;
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp b/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
index b55daae21a..c3fd6b9157 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
@@ -222,7 +222,7 @@ void CXFA_FFCheckButton::AddUIMargin(int32_t iCapPlacement) {
   }
 }
 
-void CXFA_FFCheckButton::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS,
                                       CFX_Matrix* pMatrix,
                                       uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -339,7 +339,7 @@ void CXFA_FFCheckButton::OnProcessEvent(CFWL_Event* pEvent) {
   m_pOldDelegate->OnProcessEvent(pEvent);
 }
 
-void CXFA_FFCheckButton::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFCheckButton::OnDrawWidget(CXFA_Graphics* pGraphics,
                                       const CFX_Matrix* pMatrix) {
   m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.h b/xfa/fxfa/app/cxfa_ffcheckbutton.h
index f92b50a692..f092abbcf8 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.h
+++ b/xfa/fxfa/app/cxfa_ffcheckbutton.h
@@ -16,7 +16,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
   ~CXFA_FFCheckButton() override;
 
   // CXFA_FFField
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
 
@@ -27,7 +27,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
   bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
   void SetFWLCheckState(XFA_CHECKSTATE eCheckState);
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.cpp b/xfa/fxfa/app/cxfa_ffcombobox.cpp
index 91de16e9c3..c317c1d90f 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/app/cxfa_ffcombobox.cpp
@@ -354,7 +354,7 @@ void CXFA_FFComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   m_pOldDelegate->OnProcessEvent(pEvent);
 }
 
-void CXFA_FFComboBox::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFComboBox::OnDrawWidget(CXFA_Graphics* pGraphics,
                                    const CFX_Matrix* pMatrix) {
   m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.h b/xfa/fxfa/app/cxfa_ffcombobox.h
index 048521f5e0..de239b624a 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.h
+++ b/xfa/fxfa/app/cxfa_ffcombobox.h
@@ -39,7 +39,7 @@ class CXFA_FFComboBox : public CXFA_FFField {
   // IFWL_WidgetDelegate
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
   virtual void OpenDropDownList();
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.cpp b/xfa/fxfa/app/cxfa_ffexclgroup.cpp
index 60f0202120..c881a79468 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.cpp
+++ b/xfa/fxfa/app/cxfa_ffexclgroup.cpp
@@ -16,7 +16,7 @@ CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_WidgetAcc* pDataAcc)
 
 CXFA_FFExclGroup::~CXFA_FFExclGroup() {}
 
-void CXFA_FFExclGroup::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFExclGroup::RenderWidget(CXFA_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
                                     uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.h b/xfa/fxfa/app/cxfa_ffexclgroup.h
index 4b66b94712..3575ad38af 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.h
+++ b/xfa/fxfa/app/cxfa_ffexclgroup.h
@@ -16,7 +16,7 @@ class CXFA_FFExclGroup : public CXFA_FFWidget {
   ~CXFA_FFExclGroup() override;
 
   // CXFA_FFWidget
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
 };
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) {}
diff --git a/xfa/fxfa/app/cxfa_fffield.h b/xfa/fxfa/app/cxfa_fffield.h
index 3799eb39b7..d2eba09a62 100644
--- a/xfa/fxfa/app/cxfa_fffield.h
+++ b/xfa/fxfa/app/cxfa_fffield.h
@@ -24,7 +24,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
 
   // CXFA_FFWidget
   CFX_RectF GetBBox(uint32_t dwStatus, bool bDrawFocus = false) override;
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool IsLoaded() override;
@@ -55,7 +55,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
   // IFWL_WidgetDelegate
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
   void UpdateFWL();
@@ -69,18 +69,18 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
   CFWL_Widget* GetNormalWidget() { return m_pNormalWidget.get(); }
   CFX_PointF FWLToClient(const CFX_PointF& point);
   void LayoutCaption();
-  void RenderCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+  void RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
 
   int32_t CalculateOverride();
   int32_t CalculateWidgetAcc(CXFA_WidgetAcc* pAcc);
   bool ProcessCommittedData();
   virtual bool CommitData();
   virtual bool IsDataChanged();
-  void DrawHighlight(CFX_Graphics* pGS,
+  void DrawHighlight(CXFA_Graphics* pGS,
                      CFX_Matrix* pMatrix,
                      uint32_t dwStatus,
                      bool bEllipse);
-  void DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+  void DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
   void TranslateFWLMessage(CFWL_Message* pMessage);
   void CapPlacement();
   void CapTopBottomPlacement(CXFA_Caption caption,
diff --git a/xfa/fxfa/app/cxfa_ffimage.cpp b/xfa/fxfa/app/cxfa_ffimage.cpp
index f8a6668a91..cfcc9d6d7d 100644
--- a/xfa/fxfa/app/cxfa_ffimage.cpp
+++ b/xfa/fxfa/app/cxfa_ffimage.cpp
@@ -34,7 +34,7 @@ void CXFA_FFImage::UnloadWidget() {
   GetDataAcc()->SetImageImage(nullptr);
 }
 
-void CXFA_FFImage::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS,
                                 CFX_Matrix* pMatrix,
                                 uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffimage.h b/xfa/fxfa/app/cxfa_ffimage.h
index 1b22fce668..aaa5df4048 100644
--- a/xfa/fxfa/app/cxfa_ffimage.h
+++ b/xfa/fxfa/app/cxfa_ffimage.h
@@ -15,7 +15,7 @@ class CXFA_FFImage : public CXFA_FFDraw {
   ~CXFA_FFImage() override;
 
   // CXFA_FFWidget
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool IsLoaded() override;
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.cpp b/xfa/fxfa/app/cxfa_ffimageedit.cpp
index 0b0b6ec853..4019dd11d8 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/cxfa_ffimageedit.cpp
@@ -51,7 +51,7 @@ void CXFA_FFImageEdit::UnloadWidget() {
   CXFA_FFField::UnloadWidget();
 }
 
-void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
                                     uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -137,7 +137,7 @@ void CXFA_FFImageEdit::OnProcessEvent(CFWL_Event* pEvent) {
   m_pOldDelegate->OnProcessEvent(pEvent);
 }
 
-void CXFA_FFImageEdit::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFImageEdit::OnDrawWidget(CXFA_Graphics* pGraphics,
                                     const CFX_Matrix* pMatrix) {
   m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.h b/xfa/fxfa/app/cxfa_ffimageedit.h
index 81b45e8de0..c81af5eb08 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.h
+++ b/xfa/fxfa/app/cxfa_ffimageedit.h
@@ -15,7 +15,7 @@ class CXFA_FFImageEdit : public CXFA_FFField {
   ~CXFA_FFImageEdit() override;
 
   // CXFA_FFField
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool LoadWidget() override;
@@ -23,7 +23,7 @@ class CXFA_FFImageEdit : public CXFA_FFField {
   bool OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
  private:
diff --git a/xfa/fxfa/app/cxfa_ffline.cpp b/xfa/fxfa/app/cxfa_ffline.cpp
index dafa660a73..6c028dd340 100644
--- a/xfa/fxfa/app/cxfa_ffline.cpp
+++ b/xfa/fxfa/app/cxfa_ffline.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fxfa/app/cxfa_ffline.h"
 
-#include "xfa/fxgraphics/cfx_graphics.h"
-#include "xfa/fxgraphics/cfx_path.h"
 #include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
+#include "xfa/fxgraphics/cxfa_path.h"
 
 CXFA_FFLine::CXFA_FFLine(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
 
@@ -47,7 +47,7 @@ void CXFA_FFLine::GetRectFromHand(CFX_RectF& rect,
   }
 }
 
-void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
                                CFX_Matrix* pMatrix,
                                uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -82,7 +82,7 @@ void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
     XFA_RectWidthoutMargin(rtLine, mgWidget);
 
   GetRectFromHand(rtLine, lineObj.GetHand(), fLineWidth);
-  CFX_Path linePath;
+  CXFA_Path linePath;
   if (lineObj.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f)
     linePath.AddLine(rtLine.TopRight(), rtLine.BottomLeft());
   else
diff --git a/xfa/fxfa/app/cxfa_ffline.h b/xfa/fxfa/app/cxfa_ffline.h
index 6803e38285..7649f5a827 100644
--- a/xfa/fxfa/app/cxfa_ffline.h
+++ b/xfa/fxfa/app/cxfa_ffline.h
@@ -15,7 +15,7 @@ class CXFA_FFLine : public CXFA_FFDraw {
   ~CXFA_FFLine() override;
 
   // CXFA_FFWidget
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
 
diff --git a/xfa/fxfa/app/cxfa_fflistbox.cpp b/xfa/fxfa/app/cxfa_fflistbox.cpp
index dd80325c34..cc9100b5db 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/app/cxfa_fflistbox.cpp
@@ -204,7 +204,7 @@ void CXFA_FFListBox::OnProcessEvent(CFWL_Event* pEvent) {
   m_pOldDelegate->OnProcessEvent(pEvent);
 }
 
-void CXFA_FFListBox::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFListBox::OnDrawWidget(CXFA_Graphics* pGraphics,
                                   const CFX_Matrix* pMatrix) {
   m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }
diff --git a/xfa/fxfa/app/cxfa_fflistbox.h b/xfa/fxfa/app/cxfa_fflistbox.h
index 6f090af63f..ac563cc86c 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.h
+++ b/xfa/fxfa/app/cxfa_fflistbox.h
@@ -19,7 +19,7 @@ class CXFA_FFListBox : public CXFA_FFField {
   bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
   void OnSelectChanged(CFWL_Widget* pWidget);
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.cpp b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
index 21e4b977a1..44ec0d42d0 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
@@ -18,8 +18,8 @@
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_path.h"
 #include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_path.h"
 
 CXFA_FFPushButton::CXFA_FFPushButton(CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pDataAcc), m_pOldDelegate(nullptr) {}
@@ -28,7 +28,7 @@ CXFA_FFPushButton::~CXFA_FFPushButton() {
   CXFA_FFPushButton::UnloadWidget();
 }
 
-void CXFA_FFPushButton::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFPushButton::RenderWidget(CXFA_Graphics* pGS,
                                      CFX_Matrix* pMatrix,
                                      uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -166,7 +166,7 @@ void CXFA_FFPushButton::LayoutHighlightCaption() {
     m_pDownTextLayout->Layout(sz);
 }
 
-void CXFA_FFPushButton::RenderHighlightCaption(CFX_Graphics* pGS,
+void CXFA_FFPushButton::RenderHighlightCaption(CXFA_Graphics* pGS,
                                                CFX_Matrix* pMatrix) {
   CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout();
   CXFA_Caption caption = m_pDataAcc->GetCaption();
@@ -205,7 +205,7 @@ void CXFA_FFPushButton::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
 }
 
-void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFPushButton::OnDrawWidget(CXFA_Graphics* pGraphics,
                                      const CFX_Matrix* pMatrix) {
   if (m_pNormalWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HiliteInverted) {
     if ((m_pNormalWidget->GetStates() & FWL_STATE_PSB_Pressed) &&
@@ -216,7 +216,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
       CXFA_Color cr(FXARGB_MAKE(128, 128, 255, 255));
       pGraphics->SetFillColor(&cr);
 
-      CFX_Path path;
+      CXFA_Path path;
       path.AddRectangle(rtFill.left, rtFill.top, rtFill.width, rtFill.height);
       pGraphics->FillPath(&path, FXFILL_WINDING, (CFX_Matrix*)pMatrix);
     }
@@ -231,7 +231,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
       pGraphics->SetStrokeColor(&cr);
       pGraphics->SetLineWidth(fLineWidth);
 
-      CFX_Path path;
+      CXFA_Path path;
       CFX_RectF rect = m_pNormalWidget->GetWidgetRect();
       path.AddRectangle(0, 0, rect.width, rect.height);
       pGraphics->StrokePath(&path, (CFX_Matrix*)pMatrix);
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.h b/xfa/fxfa/app/cxfa_ffpushbutton.h
index 797d92d970..e64ef706f3 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.h
+++ b/xfa/fxfa/app/cxfa_ffpushbutton.h
@@ -24,7 +24,7 @@ class CXFA_FFPushButton : public CXFA_FFField {
   ~CXFA_FFPushButton() override;
 
   // CXFA_FFField
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool LoadWidget() override;
@@ -33,13 +33,13 @@ class CXFA_FFPushButton : public CXFA_FFField {
   void UpdateWidgetProperty() override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
  private:
   void LoadHighlightCaption();
   void LayoutHighlightCaption();
-  void RenderHighlightCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+  void RenderHighlightCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
   float GetLineWidth();
   FX_ARGB GetLineColor();
   FX_ARGB GetFillColor();
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.cpp b/xfa/fxfa/app/cxfa_ffrectangle.cpp
index bccf7404f2..89ae129cb1 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/app/cxfa_ffrectangle.cpp
@@ -11,7 +11,7 @@ CXFA_FFRectangle::CXFA_FFRectangle(CXFA_WidgetAcc* pDataAcc)
 
 CXFA_FFRectangle::~CXFA_FFRectangle() {}
 
-void CXFA_FFRectangle::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
                                     uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.h b/xfa/fxfa/app/cxfa_ffrectangle.h
index 499f60007e..2ddb35dade 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.h
+++ b/xfa/fxfa/app/cxfa_ffrectangle.h
@@ -15,7 +15,7 @@ class CXFA_FFRectangle : public CXFA_FFDraw {
   ~CXFA_FFRectangle() override;
 
   // CXFA_FFWidget
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
 };
diff --git a/xfa/fxfa/app/cxfa_ffsignature.cpp b/xfa/fxfa/app/cxfa_ffsignature.cpp
index a5d33ad51c..0afe5cc86a 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/app/cxfa_ffsignature.cpp
@@ -20,7 +20,7 @@ bool CXFA_FFSignature::LoadWidget() {
   return CXFA_FFField::LoadWidget();
 }
 
-void CXFA_FFSignature::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFSignature::RenderWidget(CXFA_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
                                     uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffsignature.h b/xfa/fxfa/app/cxfa_ffsignature.h
index 839cfaf5fc..8d2a33e21a 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.h
+++ b/xfa/fxfa/app/cxfa_ffsignature.h
@@ -15,7 +15,7 @@ class CXFA_FFSignature final : public CXFA_FFField {
   ~CXFA_FFSignature() override;
 
   // CXFA_FFField
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool LoadWidget() override;
diff --git a/xfa/fxfa/app/cxfa_fftext.cpp b/xfa/fxfa/app/cxfa_fftext.cpp
index b5224eaaed..3d90e6cd4e 100644
--- a/xfa/fxfa/app/cxfa_fftext.cpp
+++ b/xfa/fxfa/app/cxfa_fftext.cpp
@@ -17,13 +17,13 @@
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_graphics.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
 
 CXFA_FFText::CXFA_FFText(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
 
 CXFA_FFText::~CXFA_FFText() {}
 
-void CXFA_FFText::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
                                CFX_Matrix* pMatrix,
                                uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_fftext.h b/xfa/fxfa/app/cxfa_fftext.h
index 3fd48da2a9..df920f0266 100644
--- a/xfa/fxfa/app/cxfa_fftext.h
+++ b/xfa/fxfa/app/cxfa_fftext.h
@@ -19,7 +19,7 @@ class CXFA_FFText : public CXFA_FFDraw {
   bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
   bool OnMouseMove(uint32_t dwFlags, const CFX_PointF& point) override;
   FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
-  void RenderWidget(CFX_Graphics* pGS,
+  void RenderWidget(CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     uint32_t dwStatus) override;
   bool IsLoaded() override;
diff --git a/xfa/fxfa/app/cxfa_fftextedit.cpp b/xfa/fxfa/app/cxfa_fftextedit.cpp
index 7248abf908..0d211eb7b4 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/app/cxfa_fftextedit.cpp
@@ -353,7 +353,7 @@ void CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
   m_pOldDelegate->OnProcessEvent(pEvent);
 }
 
-void CXFA_FFTextEdit::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFTextEdit::OnDrawWidget(CXFA_Graphics* pGraphics,
                                    const CFX_Matrix* pMatrix) {
   m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }
diff --git a/xfa/fxfa/app/cxfa_fftextedit.h b/xfa/fxfa/app/cxfa_fftextedit.h
index fa0779ed2c..109a31a0de 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.h
+++ b/xfa/fxfa/app/cxfa_fftextedit.h
@@ -33,7 +33,7 @@ class CXFA_FFTextEdit : public CXFA_FFField {
   bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
+  void OnDrawWidget(CXFA_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
   void OnTextChanged(CFWL_Widget* pWidget,
diff --git a/xfa/fxfa/app/cxfa_fwltheme.cpp b/xfa/fxfa/app/cxfa_fwltheme.cpp
index fbcbd75b6e..5ad0873e19 100644
--- a/xfa/fxfa/app/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/app/cxfa_fwltheme.cpp
@@ -105,7 +105,7 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) {
     if (pParams->m_iPart == CFWL_Part::Caption)
       m_pTextOut->SetTextColor(ArgbEncode(0xff, 0, 153, 255));
 
-    CFX_Graphics* pGraphics = pParams->m_pGraphics;
+    CXFA_Graphics* pGraphics = pParams->m_pGraphics;
     CFX_RenderDevice* pRenderDevice = pGraphics->GetRenderDevice();
     if (!pRenderDevice)
       return;
@@ -126,7 +126,7 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) {
     return;
 
   CXFA_WidgetAcc* pAcc = pWidget->GetDataAcc();
-  CFX_Graphics* pGraphics = pParams->m_pGraphics;
+  CXFA_Graphics* pGraphics = pParams->m_pGraphics;
   CFX_RenderDevice* pRenderDevice = pGraphics->GetRenderDevice();
   if (!pRenderDevice)
     return;
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 8a9841db2d..2573ff4f6b 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -30,11 +30,11 @@
 #include "xfa/fxfa/cxfa_widgetacc.h"
 #include "xfa/fxfa/parser/cxfa_corner.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
-#include "xfa/fxgraphics/cfx_graphics.h"
-#include "xfa/fxgraphics/cfx_path.h"
-#include "xfa/fxgraphics/cfx_pattern.h"
-#include "xfa/fxgraphics/cfx_shading.h"
 #include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
+#include "xfa/fxgraphics/cxfa_path.h"
+#include "xfa/fxgraphics/cxfa_pattern.h"
+#include "xfa/fxgraphics/cxfa_shading.h"
 
 CXFA_FFWidget::CXFA_FFWidget(CXFA_WidgetAcc* pDataAcc)
     : CXFA_ContentLayoutItem(pDataAcc->GetNode()),
@@ -110,7 +110,7 @@ bool CXFA_FFWidget::GetToolTip(CFX_WideString& wsToolTip) {
   return GetCaptionText(wsToolTip);
 }
 
-void CXFA_FFWidget::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFWidget::RenderWidget(CXFA_Graphics* pGS,
                                  CFX_Matrix* pMatrix,
                                  uint32_t dwStatus) {
   if (!IsMatchVisibleStatus(dwStatus))
@@ -145,7 +145,7 @@ bool CXFA_FFWidget::UpdateFWLData() {
   return false;
 }
 void CXFA_FFWidget::UpdateWidgetProperty() {}
-void CXFA_FFWidget::DrawBorder(CFX_Graphics* pGS,
+void CXFA_FFWidget::DrawBorder(CXFA_Graphics* pGS,
                                CXFA_Box box,
                                const CFX_RectF& rtBorder,
                                CFX_Matrix* pMatrix,
@@ -494,7 +494,7 @@ void CXFA_FFWidget::SetButtonDown(bool bSet) {
   bSet ? m_dwStatus |= XFA_WidgetStatus_ButtonDown
        : m_dwStatus &= ~XFA_WidgetStatus_ButtonDown;
 }
-int32_t XFA_StrokeTypeSetLineDash(CFX_Graphics* pGraphics,
+int32_t XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
                                   int32_t iStrokeType,
                                   int32_t iCapType) {
   switch (iStrokeType) {
@@ -824,7 +824,7 @@ void CXFA_ImageRenderer::CompositeDIBitmap(
     continue;
 }
 
-void XFA_DrawImage(CFX_Graphics* pGS,
+void XFA_DrawImage(CXFA_Graphics* pGS,
                    const CFX_RectF& rtImage,
                    CFX_Matrix* pMatrix,
                    const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap,
@@ -1177,7 +1177,7 @@ bool XFA_IsCreateWidget(XFA_Element eType) {
 }
 static void XFA_BOX_GetPath_Arc(CXFA_Box box,
                                 CFX_RectF rtDraw,
-                                CFX_Path& fillPath,
+                                CXFA_Path& fillPath,
                                 uint32_t dwFlags) {
   float a, b;
   a = rtDraw.width / 2.0f;
@@ -1205,7 +1205,7 @@ static void XFA_BOX_GetPath_Arc(CXFA_Box box,
 static void XFA_BOX_GetPath(CXFA_Box box,
                             const std::vector<CXFA_Stroke>& strokes,
                             CFX_RectF rtWidget,
-                            CFX_Path& path,
+                            CXFA_Path& path,
                             int32_t nIndex,
                             bool bStart,
                             bool bCorner) {
@@ -1374,7 +1374,7 @@ static void XFA_BOX_GetPath(CXFA_Box box,
 static void XFA_BOX_GetFillPath(CXFA_Box box,
                                 const std::vector<CXFA_Stroke>& strokes,
                                 CFX_RectF rtWidget,
-                                CFX_Path& fillPath,
+                                CXFA_Path& fillPath,
                                 uint16_t dwFlags) {
   if (box.IsArc() || (dwFlags & XFA_DRAWBOX_ForceRound) != 0) {
     CXFA_Edge edge = box.GetEdge(0);
@@ -1523,8 +1523,8 @@ static void XFA_BOX_GetFillPath(CXFA_Box box,
   }
 }
 static void XFA_BOX_Fill_Radial(CXFA_Box box,
-                                CFX_Graphics* pGS,
-                                CFX_Path& fillPath,
+                                CXFA_Graphics* pGS,
+                                CXFA_Path& fillPath,
                                 CFX_RectF rtFill,
                                 CFX_Matrix* pMatrix) {
   CXFA_Fill fill = box.GetFill();
@@ -1536,18 +1536,18 @@ static void XFA_BOX_Fill_Radial(CXFA_Box box,
     crEnd = crStart;
     crStart = temp;
   }
-  CFX_Shading shading(rtFill.Center(), rtFill.Center(), 0,
-                      sqrt(rtFill.Width() * rtFill.Width() +
-                           rtFill.Height() * rtFill.Height()) /
-                          2,
-                      true, true, crStart, crEnd);
+  CXFA_Shading shading(rtFill.Center(), rtFill.Center(), 0,
+                       sqrt(rtFill.Width() * rtFill.Width() +
+                            rtFill.Height() * rtFill.Height()) /
+                           2,
+                       true, true, crStart, crEnd);
   CXFA_Color cr(&shading);
   pGS->SetFillColor(&cr);
   pGS->FillPath(&fillPath, FXFILL_WINDING, pMatrix);
 }
 static void XFA_BOX_Fill_Pattern(CXFA_Box box,
-                                 CFX_Graphics* pGS,
-                                 CFX_Path& fillPath,
+                                 CXFA_Graphics* pGS,
+                                 CXFA_Path& fillPath,
                                  CFX_RectF rtFill,
                                  CFX_Matrix* pMatrix) {
   CXFA_Fill fill = box.GetFill();
@@ -1575,14 +1575,14 @@ static void XFA_BOX_Fill_Pattern(CXFA_Box box,
       break;
   }
 
-  CFX_Pattern pattern(iHatch, crEnd, crStart);
+  CXFA_Pattern pattern(iHatch, crEnd, crStart);
   CXFA_Color cr(&pattern, 0x0);
   pGS->SetFillColor(&cr);
   pGS->FillPath(&fillPath, FXFILL_WINDING, pMatrix);
 }
 static void XFA_BOX_Fill_Linear(CXFA_Box box,
-                                CFX_Graphics* pGS,
-                                CFX_Path& fillPath,
+                                CXFA_Graphics* pGS,
+                                CXFA_Path& fillPath,
                                 CFX_RectF rtFill,
                                 CFX_Matrix* pMatrix) {
   CXFA_Fill fill = box.GetFill();
@@ -1611,14 +1611,14 @@ static void XFA_BOX_Fill_Linear(CXFA_Box box,
     default:
       break;
   }
-  CFX_Shading shading(ptStart, ptEnd, false, false, crStart, crEnd);
+  CXFA_Shading shading(ptStart, ptEnd, false, false, crStart, crEnd);
   CXFA_Color cr(&shading);
   pGS->SetFillColor(&cr);
   pGS->FillPath(&fillPath, FXFILL_WINDING, pMatrix);
 }
 static void XFA_BOX_Fill(CXFA_Box box,
                          const std::vector<CXFA_Stroke>& strokes,
-                         CFX_Graphics* pGS,
+                         CXFA_Graphics* pGS,
                          const CFX_RectF& rtWidget,
                          CFX_Matrix* pMatrix,
                          uint32_t dwFlags) {
@@ -1627,7 +1627,7 @@ static void XFA_BOX_Fill(CXFA_Box box,
     return;
 
   pGS->SaveGraphState();
-  CFX_Path fillPath;
+  CXFA_Path fillPath;
   XFA_BOX_GetFillPath(box, strokes, rtWidget, fillPath,
                       (dwFlags & XFA_DRAWBOX_ForceRound) != 0);
   fillPath.Close();
@@ -1663,8 +1663,8 @@ static void XFA_BOX_Fill(CXFA_Box box,
   pGS->RestoreGraphState();
 }
 static void XFA_BOX_StrokePath(CXFA_Stroke stroke,
-                               CFX_Path* pPath,
-                               CFX_Graphics* pGS,
+                               CXFA_Path* pPath,
+                               CXFA_Graphics* pGS,
                                CFX_Matrix* pMatrix) {
   if (!stroke || !stroke.IsVisible()) {
     return;
@@ -1687,7 +1687,7 @@ static void XFA_BOX_StrokePath(CXFA_Stroke stroke,
   pGS->RestoreGraphState();
 }
 static void XFA_BOX_StrokeArc(CXFA_Box box,
-                              CFX_Graphics* pGS,
+                              CXFA_Graphics* pGS,
                               CFX_RectF rtWidget,
                               CFX_Matrix* pMatrix,
                               uint32_t dwFlags) {
@@ -1718,7 +1718,7 @@ static void XFA_BOX_StrokeArc(CXFA_Box box,
     if (fHalf < 0.001f)
       return;
 
-    CFX_Path arcPath;
+    CXFA_Path arcPath;
     XFA_BOX_GetPath_Arc(box, rtWidget, arcPath, dwFlags);
     XFA_BOX_StrokePath(edge, &arcPath, pGS, pMatrix);
     return;
@@ -1744,7 +1744,7 @@ static void XFA_BOX_StrokeArc(CXFA_Box box,
   startAngle = startAngle * FX_PI / 180.0f;
   sweepAngle = -sweepAngle * FX_PI / 180.0f;
 
-  CFX_Path arcPath;
+  CXFA_Path arcPath;
   arcPath.AddArc(rtWidget.TopLeft(), rtWidget.Size(), 3.0f * FX_PI / 4.0f,
                  FX_PI);
 
@@ -1775,7 +1775,7 @@ static void XFA_BOX_StrokeArc(CXFA_Box box,
   pGS->StrokePath(&arcPath, pMatrix);
   pGS->RestoreGraphState();
 }
-static void XFA_Draw3DRect(CFX_Graphics* pGraphic,
+static void XFA_Draw3DRect(CXFA_Graphics* pGraphic,
                            const CFX_RectF& rt,
                            float fLineWidth,
                            CFX_Matrix* pMatrix,
@@ -1785,7 +1785,7 @@ static void XFA_Draw3DRect(CFX_Graphics* pGraphic,
   pGraphic->SetFillColor(&crLT);
   float fBottom = rt.bottom();
   float fRight = rt.right();
-  CFX_Path pathLT;
+  CXFA_Path pathLT;
   pathLT.MoveTo(CFX_PointF(rt.left, fBottom));
   pathLT.LineTo(CFX_PointF(rt.left, rt.top));
   pathLT.LineTo(CFX_PointF(fRight, rt.top));
@@ -1798,7 +1798,7 @@ static void XFA_Draw3DRect(CFX_Graphics* pGraphic,
   CXFA_Color crRB(argbBottomRight);
   pGraphic->SetFillColor(&crRB);
 
-  CFX_Path pathRB;
+  CXFA_Path pathRB;
   pathRB.MoveTo(CFX_PointF(fRight, rt.top));
   pathRB.LineTo(CFX_PointF(fRight, fBottom));
   pathRB.LineTo(CFX_PointF(rt.left, fBottom));
@@ -1808,7 +1808,7 @@ static void XFA_Draw3DRect(CFX_Graphics* pGraphic,
   pathRB.LineTo(CFX_PointF(fRight, rt.top));
   pGraphic->FillPath(&pathRB, FXFILL_WINDING, pMatrix);
 }
-static void XFA_BOX_Stroke_3DRect_Lowered(CFX_Graphics* pGS,
+static void XFA_BOX_Stroke_3DRect_Lowered(CXFA_Graphics* pGS,
                                           CFX_RectF rt,
                                           float fThickness,
                                           CFX_Matrix* pMatrix) {
@@ -1817,13 +1817,13 @@ static void XFA_BOX_Stroke_3DRect_Lowered(CFX_Graphics* pGS,
   rtInner.Deflate(fHalfWidth, fHalfWidth);
   CXFA_Color cr(0xFF000000);
   pGS->SetFillColor(&cr);
-  CFX_Path path;
+  CXFA_Path path;
   path.AddRectangle(rt.left, rt.top, rt.width, rt.height);
   path.AddRectangle(rtInner.left, rtInner.top, rtInner.width, rtInner.height);
   pGS->FillPath(&path, FXFILL_ALTERNATE, pMatrix);
   XFA_Draw3DRect(pGS, rtInner, fHalfWidth, pMatrix, 0xFF808080, 0xFFC0C0C0);
 }
-static void XFA_BOX_Stroke_3DRect_Raised(CFX_Graphics* pGS,
+static void XFA_BOX_Stroke_3DRect_Raised(CXFA_Graphics* pGS,
                                          CFX_RectF rt,
                                          float fThickness,
                                          CFX_Matrix* pMatrix) {
@@ -1832,13 +1832,13 @@ static void XFA_BOX_Stroke_3DRect_Raised(CFX_Graphics* pGS,
   rtInner.Deflate(fHalfWidth, fHalfWidth);
   CXFA_Color cr(0xFF000000);
   pGS->SetFillColor(&cr);
-  CFX_Path path;
+  CXFA_Path path;
   path.AddRectangle(rt.left, rt.top, rt.width, rt.height);
   path.AddRectangle(rtInner.left, rtInner.top, rtInner.width, rtInner.height);
   pGS->FillPath(&path, FXFILL_ALTERNATE, pMatrix);
   XFA_Draw3DRect(pGS, rtInner, fHalfWidth, pMatrix, 0xFFFFFFFF, 0xFF808080);
 }
-static void XFA_BOX_Stroke_3DRect_Etched(CFX_Graphics* pGS,
+static void XFA_BOX_Stroke_3DRect_Etched(CXFA_Graphics* pGS,
                                          CFX_RectF rt,
                                          float fThickness,
                                          CFX_Matrix* pMatrix) {
@@ -1848,7 +1848,7 @@ static void XFA_BOX_Stroke_3DRect_Etched(CFX_Graphics* pGS,
   rtInner.Deflate(fHalfWidth, fHalfWidth);
   XFA_Draw3DRect(pGS, rtInner, fHalfWidth, pMatrix, 0xFFFFFFFF, 0xFF808080);
 }
-static void XFA_BOX_Stroke_3DRect_Embossed(CFX_Graphics* pGS,
+static void XFA_BOX_Stroke_3DRect_Embossed(CXFA_Graphics* pGS,
                                            CFX_RectF rt,
                                            float fThickness,
                                            CFX_Matrix* pMatrix) {
@@ -1860,7 +1860,7 @@ static void XFA_BOX_Stroke_3DRect_Embossed(CFX_Graphics* pGS,
 }
 static void XFA_BOX_Stroke_Rect(CXFA_Box box,
                                 const std::vector<CXFA_Stroke>& strokes,
-                                CFX_Graphics* pGS,
+                                CXFA_Graphics* pGS,
                                 CFX_RectF rtWidget,
                                 CFX_Matrix* pMatrix) {
   bool bVisible = false;
@@ -1918,7 +1918,7 @@ static void XFA_BOX_Stroke_Rect(CXFA_Box box,
     }
   }
   bool bStart = true;
-  CFX_Path path;
+  CXFA_Path path;
   for (int32_t i = 0; i < 8; i++) {
     CXFA_Stroke stroke = strokes[i];
     if ((i % 1) == 0 && stroke.GetRadius() < 0) {
@@ -1948,7 +1948,7 @@ static void XFA_BOX_Stroke_Rect(CXFA_Box box,
 }
 static void XFA_BOX_Stroke(CXFA_Box box,
                            const std::vector<CXFA_Stroke>& strokes,
-                           CFX_Graphics* pGS,
+                           CXFA_Graphics* pGS,
                            CFX_RectF rtWidget,
                            CFX_Matrix* pMatrix,
                            uint32_t dwFlags) {
@@ -2012,7 +2012,7 @@ static void XFA_BOX_Stroke(CXFA_Box box,
   XFA_BOX_Stroke_Rect(box, strokes, pGS, rtWidget, pMatrix);
 }
 void XFA_DrawBox(CXFA_Box box,
-                 CFX_Graphics* pGS,
+                 CXFA_Graphics* pGS,
                  const CFX_RectF& rtWidget,
                  CFX_Matrix* pMatrix,
                  uint32_t dwFlags) {
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 29161403c2..0e7c35e361 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -35,11 +35,11 @@ enum XFA_WIDGETITEM {
   XFA_WIDGETITEM_PrevSibling,
 };
 
-int32_t XFA_StrokeTypeSetLineDash(CFX_Graphics* pGraphics,
+int32_t XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
                                   int32_t iStrokeType,
                                   int32_t iCapType);
 CFX_GraphStateData::LineCap XFA_LineCapToFXGE(int32_t iLineCap);
-void XFA_DrawImage(CFX_Graphics* pGS,
+void XFA_DrawImage(CXFA_Graphics* pGS,
                    const CFX_RectF& rtImage,
                    CFX_Matrix* pMatrix,
                    const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap,
@@ -71,7 +71,7 @@ bool XFA_IsCreateWidget(XFA_Element iType);
 #define XFA_DRAWBOX_ForceRound 1
 #define XFA_DRAWBOX_Lowered3D 2
 void XFA_DrawBox(CXFA_Box box,
-                 CFX_Graphics* pGS,
+                 CXFA_Graphics* pGS,
                  const CFX_RectF& rtWidget,
                  CFX_Matrix* pMatrix,
                  uint32_t dwFlags = 0);
@@ -91,7 +91,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem {
   ~CXFA_FFWidget() override;
 
   virtual CFX_RectF GetBBox(uint32_t dwStatus, bool bDrawFocus = false);
-  virtual void RenderWidget(CFX_Graphics* pGS,
+  virtual void RenderWidget(CXFA_Graphics* pGS,
                             CFX_Matrix* pMatrix,
                             uint32_t dwStatus);
   virtual bool IsLoaded();
@@ -171,7 +171,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem {
  protected:
   virtual bool PtInActiveRect(const CFX_PointF& point);
 
-  void DrawBorder(CFX_Graphics* pGS,
+  void DrawBorder(CXFA_Graphics* pGS,
                   CXFA_Box box,
                   const CFX_RectF& rtBorder,
                   CFX_Matrix* pMatrix,
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 680a00a975..b703f746e8 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -155,7 +155,7 @@ bool CXFA_FFWidgetHandler::OnSetCursor(CXFA_FFWidget* hWidget,
 }
 
 void CXFA_FFWidgetHandler::RenderWidget(CXFA_FFWidget* hWidget,
-                                        CFX_Graphics* pGS,
+                                        CXFA_Graphics* pGS,
                                         CFX_Matrix* pMatrix,
                                         bool bHighlight) {
   hWidget->RenderWidget(pGS, pMatrix,
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.h b/xfa/fxfa/cxfa_ffwidgethandler.h
index 8f44dbbd45..36d91a709c 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.h
+++ b/xfa/fxfa/cxfa_ffwidgethandler.h
@@ -59,7 +59,7 @@ class CXFA_FFWidgetHandler {
   FWL_WidgetHit OnHitTest(CXFA_FFWidget* hWidget, const CFX_PointF& point);
   bool OnSetCursor(CXFA_FFWidget* hWidget, const CFX_PointF& point);
   void RenderWidget(CXFA_FFWidget* hWidget,
-                    CFX_Graphics* pGS,
+                    CXFA_Graphics* pGS,
                     CFX_Matrix* pMatrix,
                     bool bHighlight);
   bool HasEvent(CXFA_WidgetAcc* pWidgetAcc, XFA_EVENTTYPE eEventType);
diff --git a/xfa/fxfa/cxfa_rendercontext.cpp b/xfa/fxfa/cxfa_rendercontext.cpp
index d709502ec8..bac13f3676 100644
--- a/xfa/fxfa/cxfa_rendercontext.cpp
+++ b/xfa/fxfa/cxfa_rendercontext.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_graphics.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
 
 CXFA_RenderContext::CXFA_RenderContext(CXFA_FFPageView* pPageView,
                                        const CFX_RectF& clipRect,
@@ -24,7 +24,7 @@ CXFA_RenderContext::CXFA_RenderContext(CXFA_FFPageView* pPageView,
 
 CXFA_RenderContext::~CXFA_RenderContext() {}
 
-void CXFA_RenderContext::DoRender(CFX_Graphics* gs) {
+void CXFA_RenderContext::DoRender(CXFA_Graphics* gs) {
   while (m_pWidget) {
     CFX_RectF rtWidgetBox = m_pWidget->GetBBox(XFA_WidgetStatus_Visible);
     rtWidgetBox.width += 1;
diff --git a/xfa/fxfa/cxfa_rendercontext.h b/xfa/fxfa/cxfa_rendercontext.h
index 0fd1dc9e1f..8f9ef3d0aa 100644
--- a/xfa/fxfa/cxfa_rendercontext.h
+++ b/xfa/fxfa/cxfa_rendercontext.h
@@ -18,7 +18,7 @@ class CXFA_RenderContext {
                      const CFX_Matrix& matrix);
   ~CXFA_RenderContext();
 
-  void DoRender(CFX_Graphics* gs);
+  void DoRender(CXFA_Graphics* gs);
 
  private:
   std::unique_ptr<IXFA_WidgetIterator> m_pWidgetIterator;
diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h
index 6dd901eaf4..3e78ed2f95 100644
--- a/xfa/fxfa/fxfa.h
+++ b/xfa/fxfa/fxfa.h
@@ -14,7 +14,7 @@
 #include "xfa/fxfa/fxfa_basic.h"
 
 class CFGAS_GEFont;
-class CFX_Graphics;
+class CXFA_Graphics;
 class CPDF_Document;
 class CXFA_FFPageView;
 class CXFA_Node;