Remove some IFX_* wrappers.

This CL removes the IFX_* wrappers between fpdfsdk/fxedit and fpdfsdk/pdfwindow
which only have a single implementation.

Review-Url: https://codereview.chromium.org/2142213002

3 files changed, 278 insertions, 743 deletions

diff --git a/fpdfsdk/fxedit/include/fx_edit.h b/fpdfsdk/fxedit/include/fx_edit.h
index cface7daa5..4ae6ec2a6c 100644
--- a/fpdfsdk/fxedit/include/fx_edit.h
+++ b/fpdfsdk/fxedit/include/fx_edit.h
@@ -7,41 +7,9 @@
 #ifndef FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_
 #define FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_
 
-#include "core/fpdfdoc/include/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_basic.h"
-#include "core/fxge/include/fx_dib.h"
 
-class CPDF_Font;
-class CPDF_PageObjectHolder;
-class CPDF_TextObject;
-class CFX_FloatPoint;
-class CFX_Matrix;
-class CFX_RenderDevice;
-class CFX_SystemHandler;
-class IFX_Edit;
 class IPVT_FontMap;
-class IFX_Edit_Iterator;
-class IFX_Edit_Notify;
-class IFX_Edit_UndoItem;
-class IFX_List;
-class IFX_List_Notify;
-
-struct CPVT_Line;
-struct CPVT_SecProps;
-struct CPVT_Section;
-struct CPVT_Word;
-struct CPVT_WordPlace;
-struct CPVT_WordProps;
-struct CPVT_WordRange;
-
-#define PVTWORD_STYLE_NORMAL 0x0000L
-#define PVTWORD_STYLE_HIGHLIGHT 0x0001L
-#define PVTWORD_STYLE_UNDERLINE 0x0002L
-#define PVTWORD_STYLE_CROSSOUT 0x0004L
-#define PVTWORD_STYLE_SQUIGGLY 0x0008L
-#define PVTWORD_STYLE_DUALCROSSOUT 0x0010L
-#define PVTWORD_STYLE_BOLD 0x0020L
-#define PVTWORD_STYLE_ITALIC 0x0040L
 
 #define FX_EDIT_ISLATINWORD(u)                  \
   (u == 0x2D || (u <= 0x005A && u >= 0x0041) || \
@@ -51,493 +19,6 @@ struct CPVT_WordRange;
 #define DEFAULT_CHARSET 1
 #endif
 
-class IFX_Edit_Notify {
- public:
-  virtual ~IFX_Edit_Notify() {}
-  // set the horizontal scrollbar information.
-  virtual void IOnSetScrollInfoX(FX_FLOAT fPlateMin,
-                                 FX_FLOAT fPlateMax,
-                                 FX_FLOAT fContentMin,
-                                 FX_FLOAT fContentMax,
-                                 FX_FLOAT fSmallStep,
-                                 FX_FLOAT fBigStep) = 0;
-  // set the vertical scrollbar information.
-  virtual void IOnSetScrollInfoY(FX_FLOAT fPlateMin,
-                                 FX_FLOAT fPlateMax,
-                                 FX_FLOAT fContentMin,
-                                 FX_FLOAT fContentMax,
-                                 FX_FLOAT fSmallStep,
-                                 FX_FLOAT fBigStep) = 0;
-  // set the position of horizontal scrollbar.
-  virtual void IOnSetScrollPosX(FX_FLOAT fx) = 0;
-  // set the position of vertical scrollbar.
-  virtual void IOnSetScrollPosY(FX_FLOAT fy) = 0;
-  // set the caret information.
-  virtual void IOnSetCaret(FX_BOOL bVisible,
-                           const CFX_FloatPoint& ptHead,
-                           const CFX_FloatPoint& ptFoot,
-                           const CPVT_WordPlace& place) = 0;
-  // if the text area is changed, send the information to user.
-  virtual void IOnContentChange(const CFX_FloatRect& rcContent) = 0;
-  // Invalidate the rectangle relative to the bounding box of edit.
-  virtual void IOnInvalidateRect(CFX_FloatRect* pRect) = 0;
-};
-
-class IFX_Edit_OprNotify {
- public:
-  virtual ~IFX_Edit_OprNotify() {}
-
-  // OprType: 0
-  virtual void OnInsertWord(const CPVT_WordPlace& place,
-                            const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 1
-  virtual void OnInsertReturn(const CPVT_WordPlace& place,
-                              const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 2
-  virtual void OnBackSpace(const CPVT_WordPlace& place,
-                           const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 3
-  virtual void OnDelete(const CPVT_WordPlace& place,
-                        const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 4
-  virtual void OnClear(const CPVT_WordPlace& place,
-                       const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 5
-  virtual void OnInsertText(const CPVT_WordPlace& place,
-                            const CPVT_WordPlace& oldplace) = 0;
-  // OprType: 6
-  virtual void OnSetText(const CPVT_WordPlace& place,
-                         const CPVT_WordPlace& oldplace) = 0;
-  //
-  virtual void OnAddUndo(IFX_Edit_UndoItem* pUndoItem) = 0;
-};
-
-class IFX_Edit_Iterator {
- public:
-  virtual ~IFX_Edit_Iterator() {}
-
- public:
-  // move the current position to the next word.
-  virtual FX_BOOL NextWord() = 0;
-  // move the current position to the next line.
-  virtual FX_BOOL NextLine() = 0;
-  // move the current position to the next section.
-  virtual FX_BOOL NextSection() = 0;
-
-  // move the current position to the previous word.
-  virtual FX_BOOL PrevWord() = 0;
-  // move the current position to the previous line.
-  virtual FX_BOOL PrevLine() = 0;
-  // move the current position to the previous section.
-  virtual FX_BOOL PrevSection() = 0;
-
-  // get the information of the current word.
-  virtual FX_BOOL GetWord(CPVT_Word& word) const = 0;
-  // get the information of the current line.
-  virtual FX_BOOL GetLine(CPVT_Line& line) const = 0;
-  // get the information of the current section.
-  virtual FX_BOOL GetSection(CPVT_Section& section) const = 0;
-  // set the current position.
-  virtual void SetAt(int32_t nWordIndex) = 0;
-  // set the current position.
-  virtual void SetAt(const CPVT_WordPlace& place) = 0;
-  // get the current position.
-  virtual const CPVT_WordPlace& GetAt() const = 0;
-
-  // get the edit which this iterator belongs to
-  virtual IFX_Edit* GetEdit() const = 0;
-};
-
-class IFX_Edit_UndoItem {
- public:
-  virtual ~IFX_Edit_UndoItem() {}
-
-  virtual void Undo() = 0;
-  virtual void Redo() = 0;
-  virtual CFX_WideString GetUndoTitle() = 0;
-};
-
-class IFX_Edit {
- public:
-  static IFX_Edit* NewEdit();
-  static void DelEdit(IFX_Edit* pEdit);
-
-  // set a IPVT_FontMap pointer implemented by user.
-  virtual void SetFontMap(IPVT_FontMap* pFontMap) = 0;
-
-  // set a IFX_Edit_Notify pointer implemented by user.
-  virtual void SetNotify(IFX_Edit_Notify* pNotify) = 0;
-  virtual void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) = 0;
-
-  // get a pointer allocated by CPDF_Edit, by this pointer, user can iterate the
-  // contents of edit, but don't need to release.
-  virtual IFX_Edit_Iterator* GetIterator() = 0;
-
-  // get a VT pointer relative to this edit.
-  virtual CPDF_VariableText* GetVariableText() = 0;
-
-  // get the IPVT_FontMap pointer set by user.
-  virtual IPVT_FontMap* GetFontMap() = 0;
-
-  // initialize the edit.
-  virtual void Initialize() = 0;
-
-  // set the bounding box of the text area.
-  virtual void SetPlateRect(const CFX_FloatRect& rect,
-                            FX_BOOL bPaint = TRUE) = 0;
-
-  // set the scroll origin
-  virtual void SetScrollPos(const CFX_FloatPoint& point) = 0;
-
-  // set the horizontal text alignment in text box, nFormat (0:left 1:middle
-  // 2:right).
-  virtual void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) = 0;
-
-  // set the vertical text alignment in text box, nFormat (0:top 1:center
-  // 2:bottom).
-  virtual void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) = 0;
-
-  // if the text is shown in secret , set a character for substitute.
-  virtual void SetPasswordChar(uint16_t wSubWord = '*',
-                               FX_BOOL bPaint = TRUE) = 0;
-
-  // set the maximal count of words of the text.
-  virtual void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE) = 0;
-
-  // if set the count of charArray , then all words is shown in equal space.
-  virtual void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE) = 0;
-
-  // set the space of two characters.
-  virtual void SetCharSpace(FX_FLOAT fCharSpace = 0.0f,
-                            FX_BOOL bPaint = TRUE) = 0;
-
-  // set the horizontal scale of all characters.
-  virtual void SetHorzScale(int32_t nHorzScale = 100,
-                            FX_BOOL bPaint = TRUE) = 0;
-
-  // set the leading of all lines
-  virtual void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE) = 0;
-
-  // if set, CRLF is allowed.
-  virtual void SetMultiLine(FX_BOOL bMultiLine = TRUE,
-                            FX_BOOL bPaint = TRUE) = 0;
-
-  // if set, all words auto fit the width of the bounding box.
-  virtual void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) = 0;
-
-  // if set, a font size is calculated to full fit the bounding box.
-  virtual void SetAutoFontSize(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) = 0;
-
-  // is set, the text is allowed to scroll.
-  virtual void SetAutoScroll(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) = 0;
-
-  // set the font size of all words.
-  virtual void SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint = TRUE) = 0;
-
-  // the text is allowed to auto-scroll, allow the text overflow?
-  virtual void SetTextOverflow(FX_BOOL bAllowed = FALSE,
-                               FX_BOOL bPaint = TRUE) = 0;
-
-  // set the selected range of text.
-  // if nStartChar == 0 and nEndChar == -1, select all the text.
-  virtual void SetSel(int32_t nStartChar, int32_t nEndChar) = 0;
-
-  // get the selected range of text.
-  virtual void GetSel(int32_t& nStartChar, int32_t& nEndChar) const = 0;
-
-  // select all the text.
-  virtual void SelectAll() = 0;
-
-  // set text is not selected.
-  virtual void SelectNone() = 0;
-
-  // get the caret position.
-  virtual int32_t GetCaret() const = 0;
-  virtual CPVT_WordPlace GetCaretWordPlace() const = 0;
-
-  // get the string of selected text.
-  virtual CFX_WideString GetSelText() const = 0;
-
-  // get the text conent
-  virtual CFX_WideString GetText() const = 0;
-
-  // query if any text is selected.
-  virtual FX_BOOL IsSelected() const = 0;
-
-  // get the scroll origin
-  virtual CFX_FloatPoint GetScrollPos() const = 0;
-
-  // get the bounding box of the text area.
-  virtual CFX_FloatRect GetPlateRect() const = 0;
-
-  // get the fact area of the text.
-  virtual CFX_FloatRect GetContentRect() const = 0;
-
-  // get the visible word range
-  virtual CPVT_WordRange GetVisibleWordRange() const = 0;
-
-  // get the whole word range
-  virtual CPVT_WordRange GetWholeWordRange() const = 0;
-
-  // get the word range of select text
-  virtual CPVT_WordRange GetSelectWordRange() const = 0;
-
-  // send the mousedown message to edit for response.
-  // if Shift key is hold, bShift is TRUE, is Ctrl key is hold, bCtrl is TRUE.
-  virtual void OnMouseDown(const CFX_FloatPoint& point,
-                           FX_BOOL bShift,
-                           FX_BOOL bCtrl) = 0;
-
-  // send the mousemove message to edit when mouse down is TRUE.
-  virtual void OnMouseMove(const CFX_FloatPoint& point,
-                           FX_BOOL bShift,
-                           FX_BOOL bCtrl) = 0;
-
-  // send the UP key message to edit.
-  virtual void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // send the DOWN key message to edit.
-  virtual void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // send the LEFT key message to edit.
-  virtual void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // send the RIGHT key message to edit.
-  virtual void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // send the HOME key message to edit.
-  virtual void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // send the END key message to edit.
-  virtual void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
-  // put text into edit.
-  virtual void SetText(const FX_WCHAR* text,
-                       int32_t charset = DEFAULT_CHARSET,
-                       const CPVT_SecProps* pSecProps = nullptr,
-                       const CPVT_WordProps* pWordProps = nullptr) = 0;
-
-  // insert a word into the edit.
-  virtual FX_BOOL InsertWord(uint16_t word,
-                             int32_t charset = DEFAULT_CHARSET,
-                             const CPVT_WordProps* pWordProps = nullptr) = 0;
-
-  // insert a return into the edit.
-  virtual FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = nullptr,
-                               const CPVT_WordProps* pWordProps = nullptr) = 0;
-
-  // insert text into the edit.
-  virtual FX_BOOL InsertText(const FX_WCHAR* text,
-                             int32_t charset = DEFAULT_CHARSET,
-                             const CPVT_SecProps* pSecProps = nullptr,
-                             const CPVT_WordProps* pWordProps = nullptr) = 0;
-
-  // do backspace operation.
-  virtual FX_BOOL Backspace() = 0;
-
-  // do delete operation.
-  virtual FX_BOOL Delete() = 0;
-
-  // delete the selected text.
-  virtual FX_BOOL Clear() = 0;
-
-  // do Redo operation.
-  virtual FX_BOOL Redo() = 0;
-
-  // do Undo operation.
-  virtual FX_BOOL Undo() = 0;
-
-  // move caret
-  virtual void SetCaret(int32_t nPos) = 0;
-
-  // arrange all words over again
-  virtual void Paint() = 0;
-
-  // allow to refresh screen?
-  virtual void EnableRefresh(FX_BOOL bRefresh) = 0;
-
-  virtual void RefreshWordRange(const CPVT_WordRange& wr) = 0;
-
-  // allow undo/redo?
-  virtual void EnableUndo(FX_BOOL bUndo) = 0;
-
-  // allow opr notify?
-  virtual void EnableOprNotify(FX_BOOL bNotify) = 0;
-
-  // map word place to word index.
-  virtual int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const = 0;
-  // map word index to word place.
-  virtual CPVT_WordPlace WordIndexToWordPlace(int32_t index) const = 0;
-
-  // get the beginning position of a line
-  virtual CPVT_WordPlace GetLineBeginPlace(
-      const CPVT_WordPlace& place) const = 0;
-
-  // get the ending position of a line
-  virtual CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const = 0;
-
-  // get the beginning position of a section
-  virtual CPVT_WordPlace GetSectionBeginPlace(
-      const CPVT_WordPlace& place) const = 0;
-
-  // get the ending position of a section
-  virtual CPVT_WordPlace GetSectionEndPlace(
-      const CPVT_WordPlace& place) const = 0;
-
-  // search a wordplace form point
-  virtual CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const = 0;
-
-  // get the font size of non_rich text or default font size of richtext.
-  virtual FX_FLOAT GetFontSize() const = 0;
-
-  // get the mask character.
-  virtual uint16_t GetPasswordChar() const = 0;
-
-  // get the count of charArray
-  virtual int32_t GetCharArray() const = 0;
-
-  // get the horizontal scale of all characters
-  virtual int32_t GetHorzScale() const = 0;
-
-  // get the space of two characters
-  virtual FX_FLOAT GetCharSpace() const = 0;
-
-  // get the latin words of specified range
-  virtual CFX_WideString GetRangeText(const CPVT_WordRange& range) const = 0;
-
-  // is the text full in bounding box
-  virtual FX_BOOL IsTextFull() const = 0;
-  virtual FX_BOOL CanUndo() const = 0;
-  virtual FX_BOOL CanRedo() const = 0;
-
-  // if the content is changed after settext?
-  virtual FX_BOOL IsModified() const = 0;
-
-  // get the total words in edit
-  virtual int32_t GetTotalWords() const = 0;
-
-  virtual void AddUndoItem(IFX_Edit_UndoItem* pUndoItem) = 0;
-
-  static CFX_ByteString GetEditAppearanceStream(
-      IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
-      const CPVT_WordRange* pRange = nullptr,
-      FX_BOOL bContinuous = TRUE,
-      uint16_t SubWord = 0);
-  static CFX_ByteString GetSelectAppearanceStream(
-      IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
-      const CPVT_WordRange* pRange = nullptr);
-  static void DrawEdit(CFX_RenderDevice* pDevice,
-                       CFX_Matrix* pUser2Device,
-                       IFX_Edit* pEdit,
-                       FX_COLORREF crTextFill,
-                       FX_COLORREF crTextStroke,
-                       const CFX_FloatRect& rcClip,
-                       const CFX_FloatPoint& ptOffset,
-                       const CPVT_WordRange* pRange,
-                       CFX_SystemHandler* pSystemHandler,
-                       void* pFFLData);
-  static void GeneratePageObjects(
-      CPDF_PageObjectHolder* pObjectHolder,
-      IFX_Edit* pEdit,
-      const CFX_FloatPoint& ptOffset,
-      const CPVT_WordRange* pRange,
-      FX_COLORREF crText,
-      CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
-
- protected:
-  virtual ~IFX_Edit() {}
-};
-
-class IFX_List_Notify {
- public:
-  // set the horizontal scrollbar information.
-  virtual void IOnSetScrollInfoX(FX_FLOAT fPlateMin,
-                                 FX_FLOAT fPlateMax,
-                                 FX_FLOAT fContentMin,
-                                 FX_FLOAT fContentMax,
-                                 FX_FLOAT fSmallStep,
-                                 FX_FLOAT fBigStep) = 0;
-  // set the vertical scrollbar information.
-  virtual void IOnSetScrollInfoY(FX_FLOAT fPlateMin,
-                                 FX_FLOAT fPlateMax,
-                                 FX_FLOAT fContentMin,
-                                 FX_FLOAT fContentMax,
-                                 FX_FLOAT fSmallStep,
-                                 FX_FLOAT fBigStep) = 0;
-  // set the position of horizontal scrollbar.
-  virtual void IOnSetScrollPosX(FX_FLOAT fx) = 0;
-  // set the position of vertical scrollbar.
-  virtual void IOnSetScrollPosY(FX_FLOAT fy) = 0;
-  // Invalidate the rectangle relative to the bounding box of edit.
-  virtual void IOnInvalidateRect(CFX_FloatRect* pRect) = 0;
-
- protected:
-  virtual ~IFX_List_Notify() {}
-};
-
-class IFX_List {
- public:
-  static IFX_List* NewList();
-  static void DelList(IFX_List* pList);
-
-  virtual void SetFontMap(IPVT_FontMap* pFontMap) = 0;
-  virtual void SetNotify(IFX_List_Notify* pNotify) = 0;
-
-  virtual void SetPlateRect(const CFX_FloatRect& rect) = 0;
-  virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
-
-  virtual CFX_FloatRect GetPlateRect() const = 0;
-  virtual CFX_FloatRect GetContentRect() const = 0;
-
-  virtual FX_FLOAT GetFontSize() const = 0;
-  virtual IFX_Edit* GetItemEdit(int32_t nIndex) const = 0;
-  virtual int32_t GetCount() const = 0;
-  virtual FX_BOOL IsItemSelected(int32_t nIndex) const = 0;
-  virtual FX_FLOAT GetFirstHeight() const = 0;
-
-  virtual void SetMultipleSel(FX_BOOL bMultiple) = 0;
-  virtual FX_BOOL IsMultipleSel() const = 0;
-  virtual FX_BOOL IsValid(int32_t nItemIndex) const = 0;
-  virtual int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const = 0;
-
-  virtual void SetScrollPos(const CFX_FloatPoint& point) = 0;
-  virtual void ScrollToListItem(int32_t nItemIndex) = 0;
-  virtual CFX_FloatRect GetItemRect(int32_t nIndex) const = 0;
-  virtual int32_t GetCaret() const = 0;
-  virtual int32_t GetSelect() const = 0;
-  virtual int32_t GetTopItem() const = 0;
-  virtual int32_t GetItemIndex(const CFX_FloatPoint& point) const = 0;
-  virtual int32_t GetFirstSelected() const = 0;
-
-  virtual void AddString(const FX_WCHAR* str) = 0;
-  virtual void SetTopItem(int32_t nIndex) = 0;
-  virtual void Select(int32_t nItemIndex) = 0;
-  virtual void SetCaret(int32_t nItemIndex) = 0;
-  virtual void Empty() = 0;
-  virtual void Cancel() = 0;
-  virtual CFX_WideString GetText() const = 0;
-
-  virtual void OnMouseDown(const CFX_FloatPoint& point,
-                           FX_BOOL bShift,
-                           FX_BOOL bCtrl) = 0;
-  virtual void OnMouseMove(const CFX_FloatPoint& point,
-                           FX_BOOL bShift,
-                           FX_BOOL bCtrl) = 0;
-  virtual void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual void OnVK(int32_t nItemIndex, FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-  virtual FX_BOOL OnChar(uint16_t nChar, FX_BOOL bShift, FX_BOOL bCtrl) = 0;
-
- protected:
-  virtual ~IFX_List() {}
-};
-
 CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                 int32_t nFontIndex,
                                 uint16_t Word,
diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h
index 6f1a6d6530..3bf5849211 100644
--- a/fpdfsdk/fxedit/include/fxet_edit.h
+++ b/fpdfsdk/fxedit/include/fxet_edit.h
@@ -13,9 +13,16 @@
 #include "core/fpdfdoc/include/cpvt_wordprops.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 
+class CPDF_PageObjectHolder;
+class CPDF_TextObject;
+class CPWL_Edit;
+class CPWL_EditCtrl;
 class CFX_Edit;
 class CFX_Edit_Iterator;
 class CFX_Edit_Provider;
+class CFX_RenderDevice;
+class CFX_SystemHandler;
+class IFX_Edit_UndoItem;
 
 #define FX_EDIT_IsFloatZero(f) (f < 0.0001 && f > -0.0001)
 #define FX_EDIT_IsFloatEqual(fa, fb) FX_EDIT_IsFloatZero(fa - fb)
@@ -178,6 +185,15 @@ class CFX_Edit_Undo {
   FX_BOOL m_bWorking;
 };
 
+class IFX_Edit_UndoItem {
+ public:
+  virtual ~IFX_Edit_UndoItem() {}
+
+  virtual void Undo() = 0;
+  virtual void Redo() = 0;
+  virtual CFX_WideString GetUndoTitle() = 0;
+};
+
 class CFX_Edit_UndoItem : public IFX_Edit_UndoItem {
  public:
   CFX_Edit_UndoItem();
@@ -357,116 +373,180 @@ class CFXEU_InsertText : public CFX_Edit_UndoItem {
   CPVT_WordProps m_WordProps;
 };
 
-class CFX_Edit : public IFX_Edit {
-  friend class CFX_Edit_Iterator;
-  friend class CFXEU_InsertWord;
-  friend class CFXEU_InsertReturn;
-  friend class CFXEU_Backspace;
-  friend class CFXEU_Delete;
-  friend class CFXEU_Clear;
-  friend class CFXEU_InsertText;
-
+class CFX_Edit {
  public:
-  explicit CFX_Edit(CPDF_VariableText* pVT);
-  ~CFX_Edit() override;
-
-  // IFX_Edit
-  void SetFontMap(IPVT_FontMap* pFontMap) override;
-  void SetNotify(IFX_Edit_Notify* pNotify) override;
-  void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
-  IFX_Edit_Iterator* GetIterator() override;
-  CPDF_VariableText* GetVariableText() override;
-  IPVT_FontMap* GetFontMap() override;
-  void Initialize() override;
-  void SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint = TRUE) override;
-  void SetScrollPos(const CFX_FloatPoint& point) override;
-  void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
-  void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
-  void SetPasswordChar(uint16_t wSubWord = '*', FX_BOOL bPaint = TRUE) override;
-  void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE) override;
-  void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE) override;
-  void SetCharSpace(FX_FLOAT fCharSpace = 0.0f, FX_BOOL bPaint = TRUE) override;
-  void SetHorzScale(int32_t nHorzScale = 100, FX_BOOL bPaint = TRUE) override;
-  void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE) override;
-  void SetMultiLine(FX_BOOL bMultiLine = TRUE, FX_BOOL bPaint = TRUE) override;
-  void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
-  void SetAutoFontSize(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
-  void SetAutoScroll(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
-  void SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint = TRUE) override;
-  void SetTextOverflow(FX_BOOL bAllowed = FALSE,
-                       FX_BOOL bPaint = TRUE) override;
-  void OnMouseDown(const CFX_FloatPoint& point,
-                   FX_BOOL bShift,
-                   FX_BOOL bCtrl) override;
-  void OnMouseMove(const CFX_FloatPoint& point,
-                   FX_BOOL bShift,
-                   FX_BOOL bCtrl) override;
-  void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) override;
+  static CFX_ByteString GetEditAppearanceStream(
+      CFX_Edit* pEdit,
+      const CFX_FloatPoint& ptOffset,
+      const CPVT_WordRange* pRange = nullptr,
+      FX_BOOL bContinuous = TRUE,
+      uint16_t SubWord = 0);
+  static CFX_ByteString GetSelectAppearanceStream(
+      CFX_Edit* pEdit,
+      const CFX_FloatPoint& ptOffset,
+      const CPVT_WordRange* pRange = nullptr);
+  static void DrawEdit(CFX_RenderDevice* pDevice,
+                       CFX_Matrix* pUser2Device,
+                       CFX_Edit* pEdit,
+                       FX_COLORREF crTextFill,
+                       FX_COLORREF crTextStroke,
+                       const CFX_FloatRect& rcClip,
+                       const CFX_FloatPoint& ptOffset,
+                       const CPVT_WordRange* pRange,
+                       CFX_SystemHandler* pSystemHandler,
+                       void* pFFLData);
+  static void DrawUnderline(CFX_RenderDevice* pDevice,
+                            CFX_Matrix* pUser2Device,
+                            CFX_Edit* pEdit,
+                            FX_COLORREF color,
+                            const CFX_FloatRect& rcClip,
+                            const CFX_FloatPoint& ptOffset,
+                            const CPVT_WordRange* pRange);
+  static void DrawRichEdit(CFX_RenderDevice* pDevice,
+                           CFX_Matrix* pUser2Device,
+                           CFX_Edit* pEdit,
+                           const CFX_FloatRect& rcClip,
+                           const CFX_FloatPoint& ptOffset,
+                           const CPVT_WordRange* pRange);
+  static void GeneratePageObjects(
+      CPDF_PageObjectHolder* pObjectHolder,
+      CFX_Edit* pEdit,
+      const CFX_FloatPoint& ptOffset,
+      const CPVT_WordRange* pRange,
+      FX_COLORREF crText,
+      CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
+  static void GenerateRichPageObjects(
+      CPDF_PageObjectHolder* pObjectHolder,
+      CFX_Edit* pEdit,
+      const CFX_FloatPoint& ptOffset,
+      const CPVT_WordRange* pRange,
+      CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray);
+  static void GenerateUnderlineObjects(CPDF_PageObjectHolder* pObjectHolder,
+                                       CFX_Edit* pEdit,
+                                       const CFX_FloatPoint& ptOffset,
+                                       const CPVT_WordRange* pRange,
+                                       FX_COLORREF color);
+
+  CFX_Edit();
+  ~CFX_Edit();
+
+  void SetFontMap(IPVT_FontMap* pFontMap);
+  void SetNotify(CPWL_EditCtrl* pNotify);
+  void SetOprNotify(CPWL_Edit* pOprNotify);
+
+  // Returns an iterator for the contents. Should not be released.
+  CFX_Edit_Iterator* GetIterator();
+  CPDF_VariableText* GetVariableText();
+  IPVT_FontMap* GetFontMap();
+  void Initialize();
+
+  // Set the bounding box of the text area.
+  void SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint = TRUE);
+  void SetScrollPos(const CFX_FloatPoint& point);
+
+  // Set the horizontal text alignment. (nFormat [0:left, 1:middle, 2:right])
+  void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE);
+  // Set the vertical text alignment. (nFormat [0:left, 1:middle, 2:right])
+  void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE);
+
+  // Set the substitution character for hidden text.
+  void SetPasswordChar(uint16_t wSubWord = '*', FX_BOOL bPaint = TRUE);
+
+  // Set the maximum number of words in the text.
+  void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE);
+  void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE);
+  void SetCharSpace(FX_FLOAT fCharSpace = 0.0f, FX_BOOL bPaint = TRUE);
+  void SetHorzScale(int32_t nHorzScale = 100, FX_BOOL bPaint = TRUE);
+  void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE);
+  void SetMultiLine(FX_BOOL bMultiLine = TRUE, FX_BOOL bPaint = TRUE);
+  void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
+  void SetAutoFontSize(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
+  void SetAutoScroll(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE);
+  void SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint = TRUE);
+  void SetTextOverflow(FX_BOOL bAllowed = FALSE, FX_BOOL bPaint = TRUE);
+  FX_BOOL IsRichText() const;
+  void SetRichText(FX_BOOL bRichText = TRUE, FX_BOOL bPaint = TRUE);
+  FX_BOOL SetRichFontSize(FX_FLOAT fFontSize);
+  FX_BOOL SetRichFontIndex(int32_t nFontIndex);
+  FX_BOOL SetRichTextColor(FX_COLORREF dwColor);
+  FX_BOOL SetRichTextScript(CPDF_VariableText::ScriptType nScriptType);
+  FX_BOOL SetRichTextBold(FX_BOOL bBold = TRUE);
+  FX_BOOL SetRichTextItalic(FX_BOOL bItalic = TRUE);
+  FX_BOOL SetRichTextUnderline(FX_BOOL bUnderline = TRUE);
+  FX_BOOL SetRichTextCrossout(FX_BOOL bCrossout = TRUE);
+  FX_BOOL SetRichTextCharSpace(FX_FLOAT fCharSpace);
+  FX_BOOL SetRichTextHorzScale(int32_t nHorzScale = 100);
+  FX_BOOL SetRichTextLineLeading(FX_FLOAT fLineLeading);
+  FX_BOOL SetRichTextLineIndent(FX_FLOAT fLineIndent);
+  FX_BOOL SetRichTextAlignment(int32_t nAlignment);
+  void OnMouseDown(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnMouseMove(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl);
   void SetText(const FX_WCHAR* text,
                int32_t charset = DEFAULT_CHARSET,
                const CPVT_SecProps* pSecProps = nullptr,
-               const CPVT_WordProps* pWordProps = nullptr) override;
+               const CPVT_WordProps* pWordProps = nullptr);
   FX_BOOL InsertWord(uint16_t word,
                      int32_t charset = DEFAULT_CHARSET,
-                     const CPVT_WordProps* pWordProps = nullptr) override;
+                     const CPVT_WordProps* pWordProps = nullptr);
   FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = nullptr,
-                       const CPVT_WordProps* pWordProps = nullptr) override;
-  FX_BOOL Backspace() override;
-  FX_BOOL Delete() override;
-  FX_BOOL Clear() override;
+                       const CPVT_WordProps* pWordProps = nullptr);
+  FX_BOOL Backspace();
+  FX_BOOL Delete();
+  FX_BOOL Clear();
   FX_BOOL InsertText(const FX_WCHAR* text,
                      int32_t charset = DEFAULT_CHARSET,
                      const CPVT_SecProps* pSecProps = nullptr,
-                     const CPVT_WordProps* pWordProps = nullptr) override;
-  FX_BOOL Redo() override;
-  FX_BOOL Undo() override;
-  int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace WordIndexToWordPlace(int32_t index) const override;
-  CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace GetSectionBeginPlace(
-      const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const override;
-  CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const override;
-  int32_t GetCaret() const override;
-  CPVT_WordPlace GetCaretWordPlace() const override;
-  CFX_WideString GetSelText() const override;
-  CFX_WideString GetText() const override;
-  FX_FLOAT GetFontSize() const override;
-  uint16_t GetPasswordChar() const override;
-  CFX_FloatPoint GetScrollPos() const override;
-  int32_t GetCharArray() const override;
-  CFX_FloatRect GetPlateRect() const override;
-  CFX_FloatRect GetContentRect() const override;
-  CFX_WideString GetRangeText(const CPVT_WordRange& range) const override;
-  int32_t GetHorzScale() const override;
-  FX_FLOAT GetCharSpace() const override;
-  int32_t GetTotalWords() const override;
-  void SetSel(int32_t nStartChar, int32_t nEndChar) override;
-  void GetSel(int32_t& nStartChar, int32_t& nEndChar) const override;
-  void SelectAll() override;
-  void SelectNone() override;
-  FX_BOOL IsSelected() const override;
-  void Paint() override;
-  void EnableRefresh(FX_BOOL bRefresh) override;
-  void RefreshWordRange(const CPVT_WordRange& wr) override;
-  void SetCaret(int32_t nPos) override;
-  CPVT_WordRange GetWholeWordRange() const override;
-  CPVT_WordRange GetSelectWordRange() const override;
-  void EnableUndo(FX_BOOL bUndo) override;
-  void EnableOprNotify(FX_BOOL bNotify) override;
-  FX_BOOL IsTextFull() const override;
+                     const CPVT_WordProps* pWordProps = nullptr);
+  FX_BOOL Redo();
+  FX_BOOL Undo();
+  int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace WordIndexToWordPlace(int32_t index) const;
+  CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetSectionBeginPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const;
+  int32_t GetCaret() const;
+  CPVT_WordPlace GetCaretWordPlace() const;
+  CFX_WideString GetSelText() const;
+  CFX_WideString GetText() const;
+  FX_FLOAT GetFontSize() const;
+  uint16_t GetPasswordChar() const;
+  CFX_FloatPoint GetScrollPos() const;
+  int32_t GetCharArray() const;
+  CFX_FloatRect GetPlateRect() const;
+  CFX_FloatRect GetContentRect() const;
+  CFX_WideString GetRangeText(const CPVT_WordRange& range) const;
+  int32_t GetHorzScale() const;
+  FX_FLOAT GetCharSpace() const;
+  int32_t GetTotalWords() const;
+  void SetSel(int32_t nStartChar, int32_t nEndChar);
+  void GetSel(int32_t& nStartChar, int32_t& nEndChar) const;
+  void SelectAll();
+  void SelectNone();
+  FX_BOOL IsSelected() const;
+  void Paint();
+  void EnableNotify(FX_BOOL bNotify);
+  void EnableRefresh(FX_BOOL bRefresh);
+  void RefreshWordRange(const CPVT_WordRange& wr);
+  void SetCaret(int32_t nPos);
+  CPVT_WordRange GetWholeWordRange() const;
+  CPVT_WordRange GetSelectWordRange() const;
+  void EnableUndo(FX_BOOL bUndo);
+  void EnableOprNotify(FX_BOOL bNotify);
+  FX_BOOL IsTextFull() const;
   FX_BOOL IsTextOverflow() const;
-  FX_BOOL CanUndo() const override;
-  FX_BOOL CanRedo() const override;
-  FX_BOOL IsModified() const override;
-  CPVT_WordRange GetVisibleWordRange() const override;
-  void AddUndoItem(IFX_Edit_UndoItem* pUndoItem) override;
+  FX_BOOL CanUndo() const;
+  FX_BOOL CanRedo() const;
+  FX_BOOL IsModified() const;
+  CPVT_WordRange GetVisibleWordRange() const;
+  void AddUndoItem(IFX_Edit_UndoItem* pUndoItem);
 
   FX_BOOL Empty();
 
@@ -480,6 +560,15 @@ class CFX_Edit : public IFX_Edit {
   int32_t GetTotalLines() const;
 
  private:
+  friend class CFX_Edit_Iterator;
+  friend class CFXEU_InsertWord;
+  friend class CFXEU_InsertReturn;
+  friend class CFXEU_Backspace;
+  friend class CFXEU_Delete;
+  friend class CFXEU_Clear;
+  friend class CFXEU_ClearRich;
+  friend class CFXEU_InsertText;
+
   void SetSel(const CPVT_WordPlace& begin, const CPVT_WordPlace& end);
 
   void RearrangeAll();
@@ -548,9 +637,9 @@ class CFX_Edit : public IFX_Edit {
   FX_FLOAT GetLineBottom(const CPVT_WordPlace& place) const;
 
  private:
-  CPDF_VariableText* m_pVT;
-  IFX_Edit_Notify* m_pNotify;
-  IFX_Edit_OprNotify* m_pOprNotify;
+  std::unique_ptr<CPDF_VariableText> m_pVT;
+  CPWL_EditCtrl* m_pNotify;
+  CPWL_Edit* m_pOprNotify;
   std::unique_ptr<CFX_Edit_Provider> m_pVTProvider;
 
   CPVT_WordPlace m_wpCaret;
@@ -560,7 +649,7 @@ class CFX_Edit : public IFX_Edit {
   CFX_FloatPoint m_ptScrollPos;
   CFX_FloatPoint m_ptRefreshScrollPos;
   FX_BOOL m_bEnableScroll;
-  std::unique_ptr<IFX_Edit_Iterator> m_pIterator;
+  std::unique_ptr<CFX_Edit_Iterator> m_pIterator;
   CFX_Edit_Refresh m_Refresh;
   CFX_FloatPoint m_ptCaret;
   CFX_Edit_Undo m_Undo;
@@ -574,25 +663,24 @@ class CFX_Edit : public IFX_Edit {
   CFX_Edit_GroupUndoItem* m_pGroupUndoItem;
 };
 
-class CFX_Edit_Iterator : public IFX_Edit_Iterator {
+class CFX_Edit_Iterator {
  public:
   CFX_Edit_Iterator(CFX_Edit* pEdit, CPDF_VariableText::Iterator* pVTIterator);
-  ~CFX_Edit_Iterator() override;
-
-  // IFX_Edit_Iterator
-  FX_BOOL NextWord() override;
-  FX_BOOL NextLine() override;
-  FX_BOOL NextSection() override;
-  FX_BOOL PrevWord() override;
-  FX_BOOL PrevLine() override;
-  FX_BOOL PrevSection() override;
-  FX_BOOL GetWord(CPVT_Word& word) const override;
-  FX_BOOL GetLine(CPVT_Line& line) const override;
-  FX_BOOL GetSection(CPVT_Section& section) const override;
-  void SetAt(int32_t nWordIndex) override;
-  void SetAt(const CPVT_WordPlace& place) override;
-  const CPVT_WordPlace& GetAt() const override;
-  IFX_Edit* GetEdit() const override;
+  ~CFX_Edit_Iterator();
+
+  FX_BOOL NextWord();
+  FX_BOOL NextLine();
+  FX_BOOL NextSection();
+  FX_BOOL PrevWord();
+  FX_BOOL PrevLine();
+  FX_BOOL PrevSection();
+  FX_BOOL GetWord(CPVT_Word& word) const;
+  FX_BOOL GetLine(CPVT_Line& line) const;
+  FX_BOOL GetSection(CPVT_Section& section) const;
+  void SetAt(int32_t nWordIndex);
+  void SetAt(const CPVT_WordPlace& place);
+  const CPVT_WordPlace& GetAt() const;
+  CFX_Edit* GetEdit() const;
 
  private:
   CFX_Edit* m_pEdit;
diff --git a/fpdfsdk/fxedit/include/fxet_list.h b/fpdfsdk/fxedit/include/fxet_list.h
index a763db52da..2377e1d080 100644
--- a/fpdfsdk/fxedit/include/fxet_list.h
+++ b/fpdfsdk/fxedit/include/fxet_list.h
@@ -7,30 +7,12 @@
 #ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_
 #define FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_
 
+#include "core/fxcrt/include/fx_coordinates.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 
-class IFX_Edit;
-
-class CLST_Size {
- public:
-  CLST_Size() : x(0.0f), y(0.0f) {}
-
-  CLST_Size(FX_FLOAT other_x, FX_FLOAT other_y) {
-    x = other_x;
-    y = other_y;
-  }
-
-  void Default() {
-    x = 0.0f;
-    y = 0.0f;
-  }
-
-  FX_BOOL operator!=(const CLST_Size& size) const {
-    return FXSYS_memcmp(this, &size, sizeof(CLST_Size)) != 0;
-  }
-
-  FX_FLOAT x, y;
-};
+class CFX_Edit;
+class CFX_Edit_Iterator;
+class CPWL_List_Notify;
 
 class CLST_Rect : public CFX_FloatRect {
  public:
@@ -119,7 +101,7 @@ class CFX_ListItem final {
   ~CFX_ListItem();
 
   void SetFontMap(IPVT_FontMap* pFontMap);
-  IFX_Edit* GetEdit() const;
+  CFX_Edit* GetEdit() const;
 
   void SetRect(const CLST_Rect& rect);
   void SetSelect(FX_BOOL bSelected);
@@ -133,9 +115,9 @@ class CFX_ListItem final {
   uint16_t GetFirstChar() const;
 
  private:
-  IFX_Edit_Iterator* GetIterator() const;
+  CFX_Edit_Iterator* GetIterator() const;
 
-  IFX_Edit* m_pEdit;
+  std::unique_ptr<CFX_Edit> m_pEdit;
   FX_BOOL m_bSelected;
   CLST_Rect m_rcListItem;
 };
@@ -144,6 +126,7 @@ class CFX_ListContainer {
  public:
   CFX_ListContainer();
   virtual ~CFX_ListContainer();
+
   virtual void SetPlateRect(const CFX_FloatRect& rect);
 
   CFX_FloatRect GetPlateRect() const { return m_rcPlate; }
@@ -200,45 +183,6 @@ class CLST_ArrayTemplate : public CFX_ArrayTemplate<TYPE> {
   }
 };
 
-class CFX_List : protected CFX_ListContainer, public IFX_List {
- public:
-  CFX_List();
-  ~CFX_List() override;
-
-  // IFX_List:
-  void SetFontMap(IPVT_FontMap* pFontMap) override;
-  void SetFontSize(FX_FLOAT fFontSize) override;
-  CFX_FloatRect GetPlateRect() const override;
-  CFX_FloatRect GetContentRect() const override;
-  FX_FLOAT GetFontSize() const override;
-  IFX_Edit* GetItemEdit(int32_t nIndex) const override;
-  int32_t GetCount() const override;
-  FX_BOOL IsItemSelected(int32_t nIndex) const override;
-  FX_FLOAT GetFirstHeight() const override;
-  void SetMultipleSel(FX_BOOL bMultiple) override;
-  FX_BOOL IsMultipleSel() const override;
-  FX_BOOL IsValid(int32_t nItemIndex) const override;
-  int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const override;
-  void Empty() override;
-  CFX_FloatRect GetItemRect(int32_t nIndex) const override;
-  int32_t GetItemIndex(const CFX_FloatPoint& point) const override;
-  int32_t GetFirstSelected() const override;
-
- protected:
-  void AddItem(const FX_WCHAR* str);
-  virtual void ReArrange(int32_t nItemIndex);
-  CFX_WideString GetItemText(int32_t nIndex) const;
-  void SetItemSelect(int32_t nItemIndex, FX_BOOL bSelected);
-  int32_t GetLastSelected() const;
-  FX_WCHAR Toupper(FX_WCHAR c) const;
-
- private:
-  CLST_ArrayTemplate<CFX_ListItem*> m_aListItems;
-  FX_FLOAT m_fFontSize;
-  IPVT_FontMap* m_pFontMap;
-  FX_BOOL m_bMultiple;
-};
-
 struct CPLST_Select_Item {
   CPLST_Select_Item(int32_t other_nItemIndex, int32_t other_nState) {
     nItemIndex = other_nItemIndex;
@@ -271,51 +215,65 @@ class CPLST_Select {
   CFX_ArrayTemplate<CPLST_Select_Item*> m_aItems;
 };
 
-class CFX_ListCtrl : public CFX_List {
+class CFX_ListCtrl : protected CFX_ListContainer {
  public:
   CFX_ListCtrl();
   ~CFX_ListCtrl() override;
 
-  // CFX_List
-  void SetNotify(IFX_List_Notify* pNotify) override;
-  void OnMouseDown(const CFX_FloatPoint& point,
-                   FX_BOOL bShift,
-                   FX_BOOL bCtrl) override;
-  void OnMouseMove(const CFX_FloatPoint& point,
-                   FX_BOOL bShift,
-                   FX_BOOL bCtrl) override;
-  void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) override;
-  void OnVK(int32_t nItemIndex, FX_BOOL bShift, FX_BOOL bCtrl) override;
-  FX_BOOL OnChar(uint16_t nChar, FX_BOOL bShift, FX_BOOL bCtrl) override;
+  // CFX_ListContainer
   void SetPlateRect(const CFX_FloatRect& rect) override;
-  void SetScrollPos(const CFX_FloatPoint& point) override;
-  void ScrollToListItem(int32_t nItemIndex) override;
-  CFX_FloatRect GetItemRect(int32_t nIndex) const override;
-  int32_t GetCaret() const override;
-  int32_t GetSelect() const override;
-  int32_t GetTopItem() const override;
-  CFX_FloatRect GetContentRect() const override;
-  int32_t GetItemIndex(const CFX_FloatPoint& point) const override;
-  void AddString(const FX_WCHAR* str) override;
-  void SetTopItem(int32_t nIndex) override;
-  void Select(int32_t nItemIndex) override;
-  void SetCaret(int32_t nItemIndex) override;
-  void Empty() override;
-  void Cancel() override;
-  CFX_WideString GetText() const override;
-  void ReArrange(int32_t nItemIndex) override;
-
-  virtual CFX_FloatPoint InToOut(const CFX_FloatPoint& point) const;
-  virtual CFX_FloatPoint OutToIn(const CFX_FloatPoint& point) const;
-  virtual CFX_FloatRect InToOut(const CFX_FloatRect& rect) const;
-  virtual CFX_FloatRect OutToIn(const CFX_FloatRect& rect) const;
+
+  void SetNotify(CPWL_List_Notify* pNotify);
+  void OnMouseDown(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnMouseMove(const CFX_FloatPoint& point, FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl);
+  void OnVK(int32_t nItemIndex, FX_BOOL bShift, FX_BOOL bCtrl);
+  FX_BOOL OnChar(uint16_t nChar, FX_BOOL bShift, FX_BOOL bCtrl);
+
+  void SetScrollPos(const CFX_FloatPoint& point);
+  void ScrollToListItem(int32_t nItemIndex);
+  CFX_FloatRect GetItemRect(int32_t nIndex) const;
+  int32_t GetCaret() const;
+  int32_t GetSelect() const;
+  int32_t GetTopItem() const;
+  CFX_FloatRect GetContentRect() const;
+  int32_t GetItemIndex(const CFX_FloatPoint& point) const;
+  void AddString(const FX_WCHAR* str);
+  void SetTopItem(int32_t nIndex);
+  void Select(int32_t nItemIndex);
+  void SetCaret(int32_t nItemIndex);
+  void Empty();
+  void Cancel();
+  CFX_WideString GetText() const;
+
+  void SetFontMap(IPVT_FontMap* pFontMap);
+  void SetFontSize(FX_FLOAT fFontSize);
+  CFX_FloatRect GetPlateRect() const;
+  FX_FLOAT GetFontSize() const;
+  CFX_Edit* GetItemEdit(int32_t nIndex) const;
+  int32_t GetCount() const;
+  FX_BOOL IsItemSelected(int32_t nIndex) const;
+  FX_FLOAT GetFirstHeight() const;
+  void SetMultipleSel(FX_BOOL bMultiple);
+  FX_BOOL IsMultipleSel() const;
+  FX_BOOL IsValid(int32_t nItemIndex) const;
+  int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const;
+  int32_t GetFirstSelected() const;
+
+  CFX_FloatPoint InToOut(const CFX_FloatPoint& point) const;
+  CFX_FloatPoint OutToIn(const CFX_FloatPoint& point) const;
+  CFX_FloatRect InToOut(const CFX_FloatRect& rect) const;
+  CFX_FloatRect OutToIn(const CFX_FloatRect& rect) const;
 
  private:
+  void ReArrange(int32_t nItemIndex);
+  CFX_FloatRect GetItemRectInternal(int32_t nIndex) const;
+  CFX_FloatRect GetContentRectInternal() const;
   void SetMultipleSelect(int32_t nItemIndex, FX_BOOL bSelected);
   void SetSingleSelect(int32_t nItemIndex);
   void InvalidateItem(int32_t nItemIndex);
@@ -323,9 +281,13 @@ class CFX_ListCtrl : public CFX_List {
   FX_BOOL IsItemVisible(int32_t nItemIndex) const;
   void SetScrollInfo();
   void SetScrollPosY(FX_FLOAT fy);
+  void AddItem(const FX_WCHAR* str);
+  CFX_WideString GetItemText(int32_t nIndex) const;
+  void SetItemSelect(int32_t nItemIndex, FX_BOOL bSelected);
+  int32_t GetLastSelected() const;
+  FX_WCHAR Toupper(FX_WCHAR c) const;
 
- private:
-  IFX_List_Notify* m_pNotify;
+  CPWL_List_Notify* m_pNotify;
   FX_BOOL m_bNotifyFlag;
   CFX_FloatPoint m_ptScrollPos;
   CPLST_Select m_aSelItems;  // for multiple
@@ -333,6 +295,10 @@ class CFX_ListCtrl : public CFX_List {
   int32_t m_nFootIndex;      // for multiple
   FX_BOOL m_bCtrlSel;        // for multiple
   int32_t m_nCaretIndex;     // for multiple
+  CLST_ArrayTemplate<CFX_ListItem*> m_aListItems;
+  FX_FLOAT m_fFontSize;
+  IPVT_FontMap* m_pFontMap;
+  FX_BOOL m_bMultiple;
 };
 
 #endif  // FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_