diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-10 16:38:10 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-10 21:53:32 +0000 |
| commit | 0cb9b8cb094532ff868314350680d3fb0ca2fe51 (patch) | |
| tree | 60e61f1e9547d5b99c010ee96b8c0ea7c0480e85 /xfa/fgas/layout | |
| parent | 1f5d4988dcdac125e3e822d37c9086a5e4a3e224 (diff) | |
| download | pdfium-0cb9b8cb094532ff868314350680d3fb0ca2fe51.tar.xz | |
Strip out custom allocator code
This Cl replaces the custom IFX_MemoryAllocator code with new/delete as needed.
Change-Id: Ie786f607c9e0b3035ffd87733bc3e29a4b6426d9
Reviewed-on: https://pdfium-review.googlesource.com/2164
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak.h | 5 | ||||
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h index c281192553..6edd860354 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -11,7 +11,6 @@ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_ucd.h" -#include "xfa/fgas/crt/fgas_memory.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_textbreak.h" #include "xfa/fgas/layout/fgas_unicode.h" @@ -83,10 +82,10 @@ struct FX_RTFTEXTOBJ { int32_t iVerticalScale; }; -class CFX_RTFPiece : public CFX_Target { +class CFX_RTFPiece { public: CFX_RTFPiece(); - ~CFX_RTFPiece() override; + ~CFX_RTFPiece(); void AppendChar(const CFX_RTFChar& tc) { ASSERT(m_pChars); diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 36602749c7..7359600c14 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -105,7 +105,7 @@ struct FX_TXTRUN { bool bSkipSpace; }; -class CFX_TxtPiece : public CFX_Target { +class CFX_TxtPiece { public: CFX_TxtPiece(); |