summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_xml.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/include/fxcrt/fx_xml.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/include/fxcrt/fx_xml.h')
-rw-r--r--core/include/fxcrt/fx_xml.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h
index 8fb00158a7..7f3dbcc205 100644
--- a/core/include/fxcrt/fx_xml.h
+++ b/core/include/fxcrt/fx_xml.h
@@ -9,14 +9,14 @@
#include "fx_basic.h"
-class CXML_AttrItem : public CFX_Object
+class CXML_AttrItem
{
public:
CFX_ByteString m_QSpaceName;
CFX_ByteString m_AttrName;
CFX_WideString m_Value;
};
-class CXML_AttrMap : public CFX_Object
+class CXML_AttrMap
{
public:
CXML_AttrMap()
@@ -35,7 +35,7 @@ public:
CXML_AttrItem& GetAt(int index) const;
CFX_ObjectArray<CXML_AttrItem>* m_pMap;
};
-class CXML_Content : public CFX_Object
+class CXML_Content
{
public:
CXML_Content() : m_bCDATA(FALSE), m_Content() {}
@@ -47,7 +47,7 @@ public:
FX_BOOL m_bCDATA;
CFX_WideString m_Content;
};
-class CXML_Element : public CFX_Object
+class CXML_Element
{
public:
static CXML_Element* Parse(const void* pBuffer, size_t size, FX_BOOL bSaveSpaceChars = FALSE, FX_FILESIZE* pParsedSize = NULL);