From e02b2bc896b0872ce1a9d0997946b07dc76b9f7b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 May 2017 10:12:39 -0700 Subject: 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 Reviewed-by: dsinclair --- core/fxcrt/cfx_char.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'core/fxcrt/cfx_char.cpp') 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; -- cgit v1.2.3