diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-01-24 14:24:36 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-25 15:37:27 +0000 |
| commit | 03de88464cc818ac4353de3e7ec49b98166bcdc5 (patch) | |
| tree | 4b28fac20a0202a67d54514686d36df74122e3b9 /core | |
| parent | d198e406d13b831ffd4b1a2bfdf12522dea31205 (diff) | |
| download | pdfium-03de88464cc818ac4353de3e7ec49b98166bcdc5.tar.xz | |
Remove last usage of IFX_Retainable.chromium/2993
Change-Id: Id2ece818c80e8cce4748b9a237871131a7acd6d1
Reviewed-on: https://pdfium-review.googlesource.com/2354
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcrt/fx_basic.h | 18 | ||||
| -rw-r--r-- | core/fxcrt/fx_ucd.h | 5 |
2 files changed, 8 insertions, 15 deletions
diff --git a/core/fxcrt/fx_basic.h b/core/fxcrt/fx_basic.h index 31850f5403..18413b2e70 100644 --- a/core/fxcrt/fx_basic.h +++ b/core/fxcrt/fx_basic.h @@ -16,6 +16,10 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#ifdef PDF_ENABLE_XFA +#define FX_IsOdd(a) ((a)&1) +#endif // PDF_ENABLE_XFA + class CFX_BinaryBuf { public: CFX_BinaryBuf(); @@ -352,9 +356,7 @@ class CFX_BitStream { protected: uint32_t m_BitPos; - uint32_t m_BitSize; - const uint8_t* m_pData; }; @@ -500,18 +502,6 @@ typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>, FX_FILESIZE> CFX_FileSizeListArray; -#ifdef PDF_ENABLE_XFA -class IFX_Retainable { - public: - virtual uint32_t Retain() = 0; - virtual uint32_t Release() = 0; - - protected: - virtual ~IFX_Retainable() {} -}; -#define FX_IsOdd(a) ((a)&1) -#endif // PDF_ENABLE_XFA - class CFX_Vector_3by1 { public: CFX_Vector_3by1() : a(0.0f), b(0.0f), c(0.0f) {} diff --git a/core/fxcrt/fx_ucd.h b/core/fxcrt/fx_ucd.h index 798658f59f..709e788636 100644 --- a/core/fxcrt/fx_ucd.h +++ b/core/fxcrt/fx_ucd.h @@ -7,6 +7,7 @@ #ifndef CORE_FXCRT_FX_UCD_H_ #define CORE_FXCRT_FX_UCD_H_ +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_basic.h" #define FX_BIDICLASSBITS 6 @@ -170,6 +171,7 @@ class CFX_RTFChar : public CFX_Char { public: CFX_RTFChar(); CFX_RTFChar(const CFX_RTFChar& other); + ~CFX_RTFChar(); uint32_t m_dwStatus; int32_t m_iFontSize; @@ -180,7 +182,7 @@ class CFX_RTFChar : public CFX_Char { int16_t m_iBidiOrder; uint32_t m_dwLayoutStyles; uint32_t m_dwIdentity; - IFX_Retainable* m_pUserData; + CFX_RetainPtr<CFX_Retainable> m_pUserData; }; inline CFX_RTFChar::CFX_RTFChar() @@ -195,6 +197,7 @@ inline CFX_RTFChar::CFX_RTFChar() m_pUserData(nullptr) {} inline CFX_RTFChar::CFX_RTFChar(const CFX_RTFChar& other) = default; +inline CFX_RTFChar::~CFX_RTFChar() = default; #endif // PDF_ENABLE_XFA |