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/android | |
| 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/android')
| -rw-r--r-- | core/src/fxge/android/fpf_skiafont.h | 2 | ||||
| -rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.h | 4 | ||||
| -rw-r--r-- | core/src/fxge/android/fpf_skiamodule.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 1d1073c1fe..4285e13554 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -10,7 +10,7 @@ class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; class SkTypeface; -class CFPF_SkiaFont : public IFPF_Font, public CFX_Object +class CFPF_SkiaFont : public IFPF_Font { public: CFPF_SkiaFont(); diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 472fbbd416..1ec4a1d678 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -11,7 +11,7 @@ #define FPF_SKIAFONTTYPE_Path 1 #define FPF_SKIAFONTTYPE_File 2 #define FPF_SKIAFONTTYPE_Buffer 3 -class CFPF_SkiaFontDescriptor : public CFX_Object +class CFPF_SkiaFontDescriptor { public: CFPF_SkiaFontDescriptor() : m_pFamily(NULL), m_dwStyle(0), m_iFaceIndex(0), m_dwCharsets(0), m_iGlyphNum(0) {} @@ -88,7 +88,7 @@ public: FX_LPVOID m_pBuffer; size_t m_szBuffer; }; -class CFPF_SkiaFontMgr : public IFPF_FontMgr, public CFX_Object +class CFPF_SkiaFontMgr : public IFPF_FontMgr { public: CFPF_SkiaFontMgr(); diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h index c3a78bf658..7f5375172a 100644 --- a/core/src/fxge/android/fpf_skiamodule.h +++ b/core/src/fxge/android/fpf_skiamodule.h @@ -8,7 +8,7 @@ #define _FPF_MODULE_H_ #if _FX_OS_ == _FX_ANDROID_ class CFPF_SkiaFontMgr; -class CFPF_SkiaDeviceModule : public IFPF_DeviceModule, public CFX_Object +class CFPF_SkiaDeviceModule : public IFPF_DeviceModule { public: CFPF_SkiaDeviceModule() : m_pFontMgr(NULL) {} |