diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 12:54:38 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 12:54:38 -0700 |
| commit | 4926900ab54a493d236291b5a24dfa4476792182 (patch) | |
| tree | e53800a0569300516c934bfccbb036ce39d98cb3 /core/src/fxcrt/extension.h | |
| parent | eddab4425614e49146f904f00da4a664ba4b581b (diff) | |
| download | pdfium-4926900ab54a493d236291b5a24dfa4476792182.tar.xz | |
Kill CFX_Object.
CFX_Object is a type that implements its own new operators that return
NULL on error. There's no need for this given the |new (std::nothrow)|
syntax; in fact, the current code can only work if there is no activity
in the constructors. This may explain the pervasive lack of
constructors and reliance on Init() methods throughout the codebase.
The activity takes place in fx_memory.h, where FX_NEW is mapped onto
the std::nothrow syntax. The rest is just cleanup.
Down the road, we will simply throw and remove all the error-checking
paths for new objects. Landing this patch first will at least show a
simple path back to the old behaviour without having to re-introduce
CFX_Object should someone want to do so in their own fork.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1088733002
Diffstat (limited to 'core/src/fxcrt/extension.h')
| -rw-r--r-- | core/src/fxcrt/extension.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h index 961e0ecf3a..dbee7e676a 100644 --- a/core/src/fxcrt/extension.h +++ b/core/src/fxcrt/extension.h @@ -28,7 +28,7 @@ public: virtual FX_BOOL Truncate(FX_FILESIZE szFile) = 0; }; IFXCRT_FileAccess* FXCRT_FileAccess_Create(); -class CFX_CRTFileStream FX_FINAL : public IFX_FileStream, public CFX_Object +class CFX_CRTFileStream FX_FINAL : public IFX_FileStream { public: CFX_CRTFileStream(IFXCRT_FileAccess* pFA) : m_pFile(pFA), m_dwCount(1), m_bUseRange(FALSE), m_nOffset(0), m_nSize(0) {} @@ -133,7 +133,7 @@ public: #define FX_MEMSTREAM_BlockSize (64 * 1024) #define FX_MEMSTREAM_Consecutive 0x01 #define FX_MEMSTREAM_TakeOver 0x02 -class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream, public CFX_Object +class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream { public: CFX_MemoryStream(FX_BOOL bConsecutive) |