diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-05-09 10:12:39 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-09 17:43:04 +0000 |
commit | e02b2bc896b0872ce1a9d0997946b07dc76b9f7b (patch) | |
tree | 9b4fb6e9e64fc4bdc208042943e5e59f7a148eb4 /core/fxcrt/cfx_char.cpp | |
parent | efd4f944deaf4687911d39dbceb4c92f728e68a0 (diff) | |
download | pdfium-e02b2bc896b0872ce1a9d0997946b07dc76b9f7b.tar.xz |
Use CXFA_TextUserData in place of CFX_Retainable where possible.
Layering prevents the (newly-moved) CFX_Char from knowing about
this class, so some casting is still required.
Change-Id: I5b7556fdfa80d09e5116b171b01ab5e707763bf0
Reviewed-on: https://pdfium-review.googlesource.com/5172
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_char.cpp')
-rw-r--r-- | core/fxcrt/cfx_char.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_char.cpp b/core/fxcrt/cfx_char.cpp index b23ae078cd..1c166353f1 100644 --- a/core/fxcrt/cfx_char.cpp +++ b/core/fxcrt/cfx_char.cpp @@ -20,8 +20,7 @@ CFX_Char::CFX_Char() m_iBidiOrder(0), m_wCharCode(0), m_iFontSize(0), - m_dwIdentity(0), - m_pUserData(nullptr) {} + m_dwIdentity(0) {} CFX_Char::CFX_Char(uint16_t wCharCode, uint32_t dwCharProps) : m_nBreakType(0), @@ -36,8 +35,7 @@ CFX_Char::CFX_Char(uint16_t wCharCode, uint32_t dwCharProps) m_iBidiOrder(0), m_wCharCode(wCharCode), m_iFontSize(0), - m_dwIdentity(0), - m_pUserData(nullptr) {} + m_dwIdentity(0) {} CFX_Char::CFX_Char(const CFX_Char& other) = default; |