diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
| commit | ae51c810a44844ef437393c1768be8f7766586b2 (patch) | |
| tree | 373bbfa8c8720af43d58a9982beea3ebf10c5d6d /core/include/fxcrt | |
| parent | e3166a8c39c8943f6cafb2ffe10bd9564e3eaf16 (diff) | |
| download | pdfium-ae51c810a44844ef437393c1768be8f7766586b2.tar.xz | |
Kill off last uses of FX_NEW in XFA.
It would seem that this never merged completely.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277583002 .
Diffstat (limited to 'core/include/fxcrt')
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 6 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_memory.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index d93d3f7193..62a8f2a369 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -1056,7 +1056,7 @@ class CFX_CountRef { } m_pObject = NULL; } - m_pObject = FX_NEW CountedObj; + m_pObject = new CountedObj; if (!m_pObject) { return NULL; } @@ -1099,7 +1099,7 @@ class CFX_CountRef { ObjClass* GetModify() { if (m_pObject == NULL) { - m_pObject = FX_NEW CountedObj; + m_pObject = new CountedObj; if (m_pObject) { m_pObject->m_RefCount = 1; } @@ -1107,7 +1107,7 @@ class CFX_CountRef { m_pObject->m_RefCount--; CountedObj* pOldObject = m_pObject; m_pObject = NULL; - m_pObject = FX_NEW CountedObj(*pOldObject); + m_pObject = new CountedObj(*pOldObject); if (m_pObject) { m_pObject->m_RefCount = 1; } diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index e24aa3ecf4..c607de2159 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -23,8 +23,6 @@ void FXMEM_DefaultFree(void* pointer, int flags); #include <limits> #include <new> -#define FX_NEW new - NEVER_INLINE void FX_OutOfMemoryTerminate(); inline void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) { |