2 files changed, 4 insertions, 13 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index 6442f1fb55..68930db919 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -874,7 +874,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
   if (!pTxtRun || pTxtRun->iLength < 1)
     return 0;
 
-  IFX_TxtAccess* pAccess = pTxtRun->pAccess;
+  CFDE_TxtEdtPage* pAccess = pTxtRun->pAccess;
   const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity;
   const FX_WCHAR* pStr = pTxtRun->wsStr.c_str();
   int32_t* pWidths = pTxtRun->pWidths;
@@ -1138,7 +1138,7 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
   if (!pTxtRun || pTxtRun->iLength < 1)
     return std::vector<CFX_RectF>();
 
-  IFX_TxtAccess* pAccess = pTxtRun->pAccess;
+  CFDE_TxtEdtPage* pAccess = pTxtRun->pAccess;
   const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity;
   const FX_WCHAR* pStr = pTxtRun->wsStr.c_str();
   int32_t* pWidths = pTxtRun->pWidths;
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h
index 0bc5768d78..1070a7bce4 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -14,13 +14,13 @@
 #include "core/fxcrt/fx_ucd.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "third_party/base/stl_util.h"
+#include "xfa/fde/cfde_txtedtpage.h"
 #include "xfa/fgas/crt/fgas_utils.h"
 
 class CFX_Char;
 class CFGAS_GEFont;
 class CFX_TxtChar;
 class CFX_TxtPiece;
-class IFX_TxtAccess;
 struct FDE_TEXTEDITPIECE;
 
 #define FX_TXTLAYOUTSTYLE_SingleLine 0x0200
@@ -47,21 +47,12 @@ inline bool CFX_BreakTypeNoneOrPiece(CFX_BreakType type) {
   return type == CFX_BreakType::None || type == CFX_BreakType::Piece;
 }
 
-class IFX_TxtAccess {
- public:
-  virtual ~IFX_TxtAccess() {}
-  virtual FX_WCHAR GetChar(const FDE_TEXTEDITPIECE* pIdentity,
-                           int32_t index) const = 0;
-  virtual int32_t GetWidth(const FDE_TEXTEDITPIECE* pIdentity,
-                           int32_t index) const = 0;
-};
-
 struct FX_TXTRUN {
   FX_TXTRUN();
   FX_TXTRUN(const FX_TXTRUN& other);
   ~FX_TXTRUN();
 
-  IFX_TxtAccess* pAccess;
+  CFDE_TxtEdtPage* pAccess;
   const FDE_TEXTEDITPIECE* pIdentity;
   CFX_WideString wsStr;
   int32_t* pWidths;