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/fxge/skia | |
| 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/fxge/skia')
| -rw-r--r-- | core/src/fxge/skia/fx_skia_blitter_new.h | 6 | ||||
| -rw-r--r-- | core/src/fxge/skia/fx_skia_device.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h index 6482832fe9..84fe89dce6 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.h +++ b/core/src/fxge/skia/fx_skia_blitter_new.h @@ -6,7 +6,7 @@ #define _FX_SKIABLITTER_H_ //#define _SKIA_SUPPORT_ #if defined(_SKIA_SUPPORT_) -class CFX_SkiaRenderer : public SkBlitter, public CFX_Object +class CFX_SkiaRenderer : public SkBlitter { protected: int m_Alpha, @@ -208,7 +208,7 @@ public: FX_BOOL Init(CFX_DIBitmap* pDevice, CFX_DIBitmap* pOriDevice, const CFX_ClipRgn* pClipRgn, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bRgbByteOrder, int alpha_flag = 0, void* pIccTransform = NULL); //The alpha flag must be fill_flag if exist. }; -class CFX_SkiaA8Renderer : public SkBlitter, public CFX_Object +class CFX_SkiaA8Renderer : public SkBlitter { public: //-------------------------------------------------------------------- @@ -226,4 +226,4 @@ public: int m_dstHeight; }; #endif -#endif
\ No newline at end of file +#endif diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index 00fe228476..6c329eee4e 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -117,7 +117,7 @@ void SuperBlitter_skia::DrawPath(const SkPath& srcPath, SkBlitter* blitter, cons proc(*devPathPtr, rect, blitter); } -class CSkia_PathData : public CFX_Object +class CSkia_PathData { public: CSkia_PathData() {} |