Encapsulate some CFX_Char members.

Change-Id: Iab34de5858ae06582023be220ef7dd0d1d0a91c9
Reviewed-on: https://pdfium-review.googlesource.com/9530
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>

1 files changed, 15 insertions, 5 deletions

diff --git a/core/fxcrt/cfx_char.h b/core/fxcrt/cfx_char.h
index cd0166feb2..009e87b388 100644
--- a/core/fxcrt/cfx_char.h
+++ b/core/fxcrt/cfx_char.h
@@ -15,28 +15,38 @@ enum class CFX_BreakType { None = 0, Piece, Line, Paragraph, Page };
 
 class CFX_Char {
  public:
-  CFX_Char();
   CFX_Char(uint16_t wCharCode, uint32_t dwCharProps);
+  CFX_Char(uint16_t wCharCode,
+           uint32_t dwCharProps,
+           int32_t iHorizontalScale,
+           int32_t iVerticalScale);
   CFX_Char(const CFX_Char& other);
   ~CFX_Char();
 
   FX_CHARTYPE GetCharType() const;
 
+  uint16_t char_code() const { return m_wCharCode; }
+  uint32_t char_props() const { return m_dwCharProps; }
+  int16_t horizonal_scale() const { return m_iHorizontalScale; }
+  int16_t vertical_scale() const { return m_iVerticalScale; }
+
   CFX_BreakType m_dwStatus;
   uint8_t m_nBreakType;
   uint32_t m_dwCharStyles;
-  uint32_t m_dwCharProps;
   int32_t m_iCharWidth;
-  int32_t m_iHorizontalScale;
-  int32_t m_iVerticalScale;
   int16_t m_iBidiClass;
   int16_t m_iBidiLevel;
   int16_t m_iBidiPos;
   int16_t m_iBidiOrder;
-  uint16_t m_wCharCode;
   int32_t m_iFontSize;
   uint32_t m_dwIdentity;
   CFX_RetainPtr<CFX_Retainable> m_pUserData;
+
+ private:
+  uint16_t m_wCharCode;
+  uint32_t m_dwCharProps;
+  int32_t m_iHorizontalScale;
+  int32_t m_iVerticalScale;
 };
 
 #endif  // CORE_FXCRT_CFX_CHAR_H_