8 files changed, 16 insertions, 17 deletions
diff --git a/xfa/fgas/layout/cfx_break.cpp b/xfa/fgas/layout/cfx_break.cpp
index 52236f3176..5c5569ad44 100644
--- a/xfa/fgas/layout/cfx_break.cpp
+++ b/xfa/fgas/layout/cfx_break.cpp
@@ -73,7 +73,7 @@ void CFX_Break::SetVerticalScale(int32_t iScale) {
   m_iVerticalScale = iScale;
 }
 
-void CFX_Break::SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont) {
+void CFX_Break::SetFont(const RetainPtr<CFGAS_GEFont>& pFont) {
   if (!pFont || pFont == m_pFont)
     return;
 
diff --git a/xfa/fgas/layout/cfx_break.h b/xfa/fgas/layout/cfx_break.h
index b45924e1e7..322fa2be8e 100644
--- a/xfa/fgas/layout/cfx_break.h
+++ b/xfa/fgas/layout/cfx_break.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/retain_ptr.h"
 #include "xfa/fgas/font/cfgas_gefont.h"
 #include "xfa/fgas/layout/cfx_breakline.h"
 
@@ -37,7 +37,7 @@ class CFX_Break {
   void SetLayoutStyles(uint32_t dwLayoutStyles);
   uint32_t GetLayoutStyles() const { return m_dwLayoutStyles; }
 
-  void SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont);
+  void SetFont(const RetainPtr<CFGAS_GEFont>& pFont);
   void SetFontSize(float fFontSize);
   void SetTabWidth(float fTabWidth);
   int32_t GetTabWidth() const { return m_iTabWidth; }
@@ -80,7 +80,7 @@ class CFX_Break {
   int32_t m_iCharSpace;
   int32_t m_iDefChar;
   wchar_t m_wDefChar;
-  CFX_RetainPtr<CFGAS_GEFont> m_pFont;
+  RetainPtr<CFGAS_GEFont> m_pFont;
   CFX_BreakLine m_Line[2];
   CFX_BreakLine* m_pCurLine;
   int8_t m_iReadyLineIndex;
diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h
index bbf4558eb1..1109e2296b 100644
--- a/xfa/fgas/layout/cfx_breakpiece.h
+++ b/xfa/fgas/layout/cfx_breakpiece.h
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "core/fxcrt/cfx_char.h"
-#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/retain_ptr.h"
 #include "xfa/fxfa/cxfa_textuserdata.h"
 
 class CFX_BreakPiece {
@@ -41,7 +41,7 @@ class CFX_BreakPiece {
   uint32_t m_dwIdentity;
   uint32_t m_dwCharStyles;
   CFX_UnownedPtr<std::vector<CFX_Char>> m_pChars;
-  CFX_RetainPtr<CXFA_TextUserData> m_pUserData;
+  RetainPtr<CXFA_TextUserData> m_pUserData;
 };
 
 #endif  // XFA_FGAS_LAYOUT_CFX_BREAKPIECE_H_
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index be5780fc7a..8768aa34ff 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -41,8 +41,7 @@ void CFX_RTFBreak::AddPositionedTab(float fTabPos) {
   m_PositionedTabs.insert(it, iTabPos);
 }
 
-void CFX_RTFBreak::SetUserData(
-    const CFX_RetainPtr<CXFA_TextUserData>& pUserData) {
+void CFX_RTFBreak::SetUserData(const RetainPtr<CXFA_TextUserData>& pUserData) {
   if (m_pUserData == pUserData)
     return;
 
@@ -668,7 +667,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText,
 
   ASSERT(pText->pFont && pText->pRect);
 
-  CFX_RetainPtr<CFGAS_GEFont> pFont = pText->pFont;
+  RetainPtr<CFGAS_GEFont> pFont = pText->pFont;
   CFX_RectF rtText(*pText->pRect);
   bool bRTLPiece = FX_IsOdd(pText->iBidiLevel);
   float fFontSize = pText->fFontSize;
diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h
index f5ad90838f..5a3f4313b5 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.h
+++ b/xfa/fgas/layout/cfx_rtfbreak.h
@@ -10,9 +10,9 @@
 #include <deque>
 #include <vector>
 
-#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_unicode.h"
+#include "core/fxcrt/retain_ptr.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "xfa/fgas/layout/cfx_break.h"
 #include "xfa/fxfa/cxfa_textuserdata.h"
@@ -33,7 +33,7 @@ struct FX_RTFTEXTOBJ {
 
   WideString pStr;
   std::vector<int32_t> pWidths;
-  CFX_RetainPtr<CFGAS_GEFont> pFont;
+  RetainPtr<CFGAS_GEFont> pFont;
   const CFX_RectF* pRect;
   wchar_t wLineBreakChar;
   float fFontSize;
@@ -51,7 +51,7 @@ class CFX_RTFBreak : public CFX_Break {
   void SetLineStartPos(float fLinePos);
 
   void SetAlignment(CFX_RTFLineAlignment align) { m_iAlignment = align; }
-  void SetUserData(const CFX_RetainPtr<CXFA_TextUserData>& pUserData);
+  void SetUserData(const RetainPtr<CXFA_TextUserData>& pUserData);
 
   void AddPositionedTab(float fTabPos);
 
@@ -92,7 +92,7 @@ class CFX_RTFBreak : public CFX_Break {
   bool m_bPagination;
   std::vector<int32_t> m_PositionedTabs;
   CFX_RTFLineAlignment m_iAlignment;
-  CFX_RetainPtr<CXFA_TextUserData> m_pUserData;
+  RetainPtr<CXFA_TextUserData> m_pUserData;
 };
 
 #endif  // XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_
diff --git a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
index bda52fc76a..5f24631315 100644
--- a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
@@ -30,7 +30,7 @@ class CFX_RTFBreakTest : public testing::Test {
   }
 
  private:
-  CFX_RetainPtr<CFGAS_GEFont> font_;
+  RetainPtr<CFGAS_GEFont> font_;
 };
 
 // As soon as you get one of the control characters the break is complete
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index 9fe5a432f6..403b7e6c11 100644
--- a/xfa/fgas/layout/cfx_txtbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -651,7 +651,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
   const wchar_t* pStr = pTxtRun->wsStr.c_str();
   int32_t* pWidths = pTxtRun->pWidths;
   int32_t iLength = pTxtRun->iLength - 1;
-  CFX_RetainPtr<CFGAS_GEFont> pFont = pTxtRun->pFont;
+  RetainPtr<CFGAS_GEFont> pFont = pTxtRun->pFont;
   uint32_t dwStyles = pTxtRun->dwStyles;
   CFX_RectF rtText(*pTxtRun->pRect);
   bool bRTLPiece = (pTxtRun->dwCharStyles & FX_TXTCHARSTYLE_OddBidiLevel) != 0;
@@ -909,7 +909,7 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
   float fFontSize = pTxtRun->fFontSize;
   int32_t iFontSize = FXSYS_round(fFontSize * 20.0f);
   float fScale = fFontSize / 1000.0f;
-  CFX_RetainPtr<CFGAS_GEFont> pFont = pTxtRun->pFont;
+  RetainPtr<CFGAS_GEFont> pFont = pTxtRun->pFont;
   if (!pFont)
     bCharBBox = false;
 
diff --git a/xfa/fgas/layout/cfx_txtbreak.h b/xfa/fgas/layout/cfx_txtbreak.h
index 959cd8eb48..e6f8da03d2 100644
--- a/xfa/fgas/layout/cfx_txtbreak.h
+++ b/xfa/fgas/layout/cfx_txtbreak.h
@@ -44,7 +44,7 @@ struct FX_TXTRUN {
   WideString wsStr;
   int32_t* pWidths;
   int32_t iLength;
-  CFX_RetainPtr<CFGAS_GEFont> pFont;
+  RetainPtr<CFGAS_GEFont> pFont;
   float fFontSize;
   uint32_t dwStyles;
   int32_t iHorizontalScale;