Merge text breaking helper classes.

This Cl merges the CFX_TxtPiece and CFX_RTFPiece classes into
CFX_BreakPiece. CFX_TxtLine and CFX_RTFLine into CFX_BreakLine and
CFX_TxtChar and CFX_RTFChar into CFX_Char.

Change-Id: I95421bdf4cafd5e394db9238dea3603ccb8349c3
Reviewed-on: https://pdfium-review.googlesource.com/2966
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 0 insertions, 76 deletions

diff --git a/core/fxcrt/fx_ucd.h b/core/fxcrt/fx_ucd.h
index f8a92a18f2..488c275808 100644
--- a/core/fxcrt/fx_ucd.h
+++ b/core/fxcrt/fx_ucd.h
@@ -119,82 +119,6 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch,
                           bool bRTL,
                           bool bVertical);
 
-enum class CFX_BreakType { None = 0, Piece, Line, Paragraph, Page };
-
-class CFX_Char {
- public:
-  CFX_Char()
-      : m_dwStatus(CFX_BreakType::None),
-        m_wCharCode(0),
-        m_nBreakType(0),
-        m_dwCharProps(0),
-        m_iCharWidth(0),
-        m_iHorizontalScale(100),
-        m_iVerticalScale(100) {}
-
-  CFX_Char(uint16_t wCharCode, uint32_t dwCharProps)
-      : m_wCharCode(wCharCode),
-        m_nBreakType(0),
-        m_dwCharProps(dwCharProps),
-        m_iCharWidth(0),
-        m_iHorizontalScale(100),
-        m_iVerticalScale(100) {}
-
-  FX_CHARTYPE GetCharType() const { return GetCharTypeFromProp(m_dwCharProps); }
-
-  CFX_BreakType m_dwStatus;
-  uint16_t m_wCharCode;
-  uint8_t m_nBreakType;
-  uint32_t m_dwCharProps;
-  int32_t m_iCharWidth;
-  int32_t m_iHorizontalScale;
-  int32_t m_iVerticalScale;
-};
-
-class CFX_TxtChar : public CFX_Char {
- public:
-  CFX_TxtChar()
-      : m_dwCharStyles(0),
-        m_iBidiClass(0),
-        m_iBidiLevel(0),
-        m_iBidiPos(0),
-        m_iBidiOrder(0) {}
-
-  uint32_t m_dwCharStyles;
-  int16_t m_iBidiClass;
-  int16_t m_iBidiLevel;
-  int16_t m_iBidiPos;
-  int16_t m_iBidiOrder;
-};
-
-class CFX_RTFChar : public CFX_Char {
- public:
-  CFX_RTFChar();
-  CFX_RTFChar(const CFX_RTFChar& other);
-  ~CFX_RTFChar();
-
-  int32_t m_iFontSize;
-  int32_t m_iFontHeight;
-  int16_t m_iBidiClass;
-  int16_t m_iBidiLevel;
-  int16_t m_iBidiPos;
-  int16_t m_iBidiOrder;
-  uint32_t m_dwIdentity;
-  CFX_RetainPtr<CFX_Retainable> m_pUserData;
-};
-
-inline CFX_RTFChar::CFX_RTFChar()
-    : m_iFontSize(0),
-      m_iFontHeight(0),
-      m_iBidiClass(0),
-      m_iBidiLevel(0),
-      m_iBidiPos(0),
-      m_dwIdentity(0),
-      m_pUserData(nullptr) {}
-
-inline CFX_RTFChar::CFX_RTFChar(const CFX_RTFChar& other) = default;
-inline CFX_RTFChar::~CFX_RTFChar() = default;
-
 #endif  // PDF_ENABLE_XFA
 
 #endif  // CORE_FXCRT_FX_UCD_H_