1 files changed, 9 insertions, 10 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 791b814d9e..260581e73b 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -91,7 +91,7 @@ class CXFA_ImageLayoutData : public CXFA_WidgetLayoutData {
     return !!m_pDIBitmap;
   }
 
-  CFX_RetainPtr<CFX_DIBitmap> m_pDIBitmap;
+  RetainPtr<CFX_DIBitmap> m_pDIBitmap;
   bool m_bNamedImage;
   int32_t m_iImageXDpi;
   int32_t m_iImageYDpi;
@@ -147,7 +147,7 @@ class CXFA_ImageEditData : public CXFA_FieldLayoutData {
     return !!m_pDIBitmap;
   }
 
-  CFX_RetainPtr<CFX_DIBitmap> m_pDIBitmap;
+  RetainPtr<CFX_DIBitmap> m_pDIBitmap;
   bool m_bNamedImage;
   int32_t m_iImageXDpi;
   int32_t m_iImageYDpi;
@@ -919,7 +919,7 @@ bool CXFA_WidgetAcc::CalculateImageAutoSize(CFX_SizeF& size) {
     LoadImageImage();
 
   size.clear();
-  CFX_RetainPtr<CFX_DIBitmap> pBitmap = GetImageImage();
+  RetainPtr<CFX_DIBitmap> pBitmap = GetImageImage();
   if (pBitmap) {
     int32_t iImageXDpi = 0;
     int32_t iImageYDpi = 0;
@@ -949,7 +949,7 @@ bool CXFA_WidgetAcc::CalculateImageEditAutoSize(CFX_SizeF& size) {
     LoadImageEditImage();
 
   size.clear();
-  CFX_RetainPtr<CFX_DIBitmap> pBitmap = GetImageEditImage();
+  RetainPtr<CFX_DIBitmap> pBitmap = GetImageEditImage();
   if (pBitmap) {
     int32_t iImageXDpi = 0;
     int32_t iImageYDpi = 0;
@@ -1459,22 +1459,21 @@ CXFA_TextLayout* CXFA_WidgetAcc::GetTextLayout() {
              : nullptr;
 }
 
-CFX_RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageImage() {
+RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageImage() {
   return m_pLayoutData
              ? static_cast<CXFA_ImageLayoutData*>(m_pLayoutData.get())
                    ->m_pDIBitmap
              : nullptr;
 }
 
-CFX_RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageEditImage() {
+RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageEditImage() {
   return m_pLayoutData
              ? static_cast<CXFA_ImageEditData*>(m_pLayoutData.get())
                    ->m_pDIBitmap
              : nullptr;
 }
 
-void CXFA_WidgetAcc::SetImageImage(
-    const CFX_RetainPtr<CFX_DIBitmap>& newImage) {
+void CXFA_WidgetAcc::SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage) {
   CXFA_ImageLayoutData* pData =
       static_cast<CXFA_ImageLayoutData*>(m_pLayoutData.get());
   if (pData->m_pDIBitmap != newImage)
@@ -1482,7 +1481,7 @@ void CXFA_WidgetAcc::SetImageImage(
 }
 
 void CXFA_WidgetAcc::SetImageEditImage(
-    const CFX_RetainPtr<CFX_DIBitmap>& newImage) {
+    const RetainPtr<CFX_DIBitmap>& newImage) {
   CXFA_ImageEditData* pData =
       static_cast<CXFA_ImageEditData*>(m_pLayoutData.get());
   if (pData->m_pDIBitmap != newImage)
@@ -1493,7 +1492,7 @@ CXFA_WidgetLayoutData* CXFA_WidgetAcc::GetWidgetLayoutData() {
   return m_pLayoutData.get();
 }
 
-CFX_RetainPtr<CFGAS_GEFont> CXFA_WidgetAcc::GetFDEFont() {
+RetainPtr<CFGAS_GEFont> CXFA_WidgetAcc::GetFDEFont() {
   WideStringView wsFontName = L"Courier";
   uint32_t dwFontStyle = 0;
   if (CXFA_Font font = GetFont(false)) {