summaryrefslogtreecommitdiff
path: root/core/src/reflow/reflowedpage.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/reflow/reflowedpage.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/reflow/reflowedpage.h')
-rw-r--r--core/src/reflow/reflowedpage.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h
index b76834132e..5ca7a8d947 100644
--- a/core/src/reflow/reflowedpage.h
+++ b/core/src/reflow/reflowedpage.h
@@ -18,7 +18,6 @@ class CRF_AttrOperation;
class CRF_OperationDate;
class CPDF_ReflowedPage;
class CPDF_Rect;
-class CFX_Object;
typedef CFX_SegmentedArray<CRF_Data*> CRF_DataPtrArray;
class CRF_CharState;
typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
@@ -26,7 +25,7 @@ typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
#define SST_BLSE 2
#define SST_ILSE 3
#define SST_IE 4
-class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor, public CFX_Object
+class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor
{
public:
CPDF_LayoutProcessor_Reflow();
@@ -106,7 +105,7 @@ struct RF_TableCell {
LayoutEnum m_InlineAlign;
};
typedef CFX_ArrayTemplate<RF_TableCell*> CRF_TableCellArray;
-class CRF_Table : public CFX_Object
+class CRF_Table
{
public:
CRF_Table()
@@ -120,7 +119,7 @@ public:
FX_FLOAT m_TableWidth;
FX_FLOAT m_ReflowPageHeight;
};
-class CRF_CharState : public CFX_Object
+class CRF_CharState
{
public:
CPDF_Font* m_pFont;
@@ -132,7 +131,7 @@ public:
CPDF_TextObject* m_pTextObj;
};
-class CRF_PageInfo : public CFX_Object
+class CRF_PageInfo
{
public:
CRF_PageInfo(CPDF_PageObject* pPageObj, CRF_PageInfo* pParent = NULL)
@@ -158,7 +157,7 @@ protected:
CPDF_PageObject* m_pPageObj;
CRF_PageInfo* m_pParent;
};
-class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData, public CFX_Object
+class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData
{
public:
@@ -192,7 +191,7 @@ public:
CFX_MapPtrToPtr* m_pPageInfos;
};
-class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser, public CFX_Object
+class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser
{
public:
CPDF_ProgressiveReflowPageParser();
@@ -227,7 +226,7 @@ protected:
int m_nObjProcessed;
int m_flags;
};
-class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender, public CFX_Object
+class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender
{
public:
CPDF_ProgressiveReflowPageRender();
@@ -292,7 +291,7 @@ protected:
#define TYPE_PATH 2
#define TYPE_IMAGE 3
#define TYPE_LINE 4
-class CRF_Data : public CFX_Object
+class CRF_Data
{
public:
typedef enum {Unknow, Text, Image, Path, Line, paragraph} RF_DataType;