summaryrefslogtreecommitdiff
path: root/core/src/fpdftext/txtproc.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-14 12:54:38 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-14 12:54:38 -0700
commit4926900ab54a493d236291b5a24dfa4476792182 (patch)
treee53800a0569300516c934bfccbb036ce39d98cb3 /core/src/fpdftext/txtproc.h
parenteddab4425614e49146f904f00da4a664ba4b581b (diff)
downloadpdfium-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/fpdftext/txtproc.h')
-rw-r--r--core/src/fpdftext/txtproc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h
index 5a88ee52f9..abbe105305 100644
--- a/core/src/fpdftext/txtproc.h
+++ b/core/src/fpdftext/txtproc.h
@@ -6,14 +6,14 @@
#ifndef _PDF_TXTPROC_H_
#define _PDF_TXTPROC_H_
-class CTextColumn : public CFX_Object
+class CTextColumn
{
public:
FX_FLOAT m_AvgPos;
int m_Count;
int m_TextPos;
};
-class CTextBox : public CFX_Object
+class CTextBox
{
public:
CFX_WideString m_Text;
@@ -25,7 +25,7 @@ public:
FX_FLOAT m_FontSizeV;
CTextColumn* m_pColumn;
};
-class CTextBaseLine : public CFX_Object
+class CTextBaseLine
{
public:
CTextBaseLine();
@@ -46,7 +46,7 @@ public:
};
class CPDF_PageObject;
class CPDF_TextObject;
-class CTextPage : public CFX_Object
+class CTextPage
{
public:
CTextPage();