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/fpdftext/fpdf_text.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/fpdftext/fpdf_text.h')
-rw-r--r-- | core/include/fpdftext/fpdf_text.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index 39008063f3..8673c1aac1 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -59,7 +59,7 @@ class IPDF_ReflowedPage; #define FPDFTEXT_WRITINGMODE_LRTB 1 #define FPDFTEXT_WRITINGMODE_RLTB 2 #define FPDFTEXT_WRITINGMODE_TBRL 3 -class CPDFText_ParseOptions : public CFX_Object +class CPDFText_ParseOptions { public: @@ -68,7 +68,7 @@ public: FX_BOOL m_bNormalizeObjs; FX_BOOL m_bOutputHyphen; }; -class IPDF_TextPage : public CFX_Object +class IPDF_TextPage { public: @@ -130,7 +130,7 @@ public: #define FPDFTEXT_MATCHCASE 0x00000001 #define FPDFTEXT_MATCHWHOLEWORD 0x00000002 #define FPDFTEXT_CONSECUTIVE 0x00000004 -class IPDF_TextPageFind : public CFX_Object +class IPDF_TextPageFind { public: @@ -151,7 +151,7 @@ public: virtual int GetMatchedCount() const = 0; }; -class IPDF_LinkExtract : public CFX_Object +class IPDF_LinkExtract { public: |