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/include/fxge/fx_dib.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/include/fxge/fx_dib.h')
-rw-r--r-- | core/include/fxge/fx_dib.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index f7e435d966..d6e99b7f73 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -136,7 +136,7 @@ FX_ARGB ArgbEncode(int a, FX_COLORREF rgb); #define FXSETFLAG_COLORTYPE(flag, val) flag = (((val)<<8)|(flag&0xffff00ff)) #define FXSETFLAG_ALPHA_FILL(flag, val) flag = ((val)|(flag&0xffffff00)) #define FXSETFLAG_ALPHA_STROKE(flag, val) flag = (((val)<<16)|(flag&0xff00ffff)) -class CFX_DIBSource : public CFX_Object +class CFX_DIBSource { public: @@ -353,7 +353,7 @@ protected: FX_BOOL GetGrayData(void* pIccTransform = NULL); }; -class CFX_DIBExtractor : public CFX_Object +class CFX_DIBExtractor { public: @@ -408,7 +408,7 @@ public: virtual FX_BOOL SetInfo(int width, int height, FXDIB_Format src_format, FX_DWORD* pSrcPalette) = 0; }; -class CFX_ScanlineCompositor : public CFX_Object +class CFX_ScanlineCompositor { public: CFX_ScanlineCompositor(); @@ -450,7 +450,7 @@ protected: int m_CacheSize; FX_BOOL m_bRgbByteOrder; }; -class CFX_BitmapComposer : public IFX_ScanlineComposer, public CFX_Object +class CFX_BitmapComposer : public IFX_ScanlineComposer { public: @@ -487,7 +487,7 @@ protected: void ComposeScanlineV(int line, FX_LPCBYTE scanline, FX_LPCBYTE scan_extra_alpha = NULL); FX_LPBYTE m_pScanlineV, m_pClipScanV, m_pAddClipScan, m_pScanlineAlphaV; }; -class CFX_BitmapStorer : public IFX_ScanlineComposer, public CFX_Object +class CFX_BitmapStorer : public IFX_ScanlineComposer { public: @@ -511,7 +511,7 @@ private: CFX_DIBitmap* m_pBitmap; }; class CStretchEngine; -class CFX_ImageStretcher : public CFX_Object +class CFX_ImageStretcher { public: @@ -548,7 +548,7 @@ public: FX_INT32 ContinueStretch(IFX_Pause* pPause); }; -class CFX_ImageTransformer : public CFX_Object +class CFX_ImageTransformer { public: @@ -569,7 +569,7 @@ public: FX_DWORD m_Flags; int m_Status; }; -class CFX_ImageRenderer : public CFX_Object +class CFX_ImageRenderer { public: |