summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi/fpdf_parser.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/fpdfapi/fpdf_parser.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/fpdfapi/fpdf_parser.h')
-rw-r--r--core/include/fpdfapi/fpdf_parser.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 4b91802601..c72acc834f 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -211,7 +211,7 @@ protected:
#define PDFWORD_TEXT 2
#define PDFWORD_DELIMITER 3
#define PDFWORD_NAME 4
-class CPDF_SimpleParser : public CFX_Object
+class CPDF_SimpleParser
{
public:
@@ -250,7 +250,7 @@ private:
FX_DWORD m_dwCurPos;
};
-class CPDF_SyntaxParser : public CFX_Object
+class CPDF_SyntaxParser
{
public:
@@ -372,7 +372,7 @@ struct PARSE_CONTEXT {
FX_FILESIZE m_DataEnd;
};
-class IPDF_DocParser : public CFX_Object
+class IPDF_DocParser
{
public:
virtual ~IPDF_DocParser() { }
@@ -613,7 +613,7 @@ protected:
#define FXCIPHER_RC4 1
#define FXCIPHER_AES 2
#define FXCIPHER_AES2 3
-class CPDF_SecurityHandler : public CFX_Object
+class CPDF_SecurityHandler
{
public:
@@ -715,7 +715,7 @@ private:
int m_KeyLen;
};
-class CPDF_CryptoHandler : public CFX_Object
+class CPDF_CryptoHandler
{
public:
@@ -772,7 +772,7 @@ protected:
FX_LPBYTE m_pAESContext;
};
-class CPDF_Point : public CFX_Object
+class CPDF_Point
{
public:
@@ -829,7 +829,7 @@ void FPDF_FileSpec_SetWin32Path(CPDF_Object* pFileSpec, const CFX_WideString&
void FlateEncode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
FX_DWORD FlateDecode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
FX_DWORD RunLengthDecode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
-class CPDF_NumberTree : public CFX_Object
+class CPDF_NumberTree
{
public:
@@ -885,7 +885,7 @@ protected:
IFX_FileAvail* m_pFileAvail;
IFX_FileRead* m_pFileRead;
};
-class CPDF_SortObjNumArray : public CFX_Object
+class CPDF_SortObjNumArray
{
public:
@@ -910,7 +910,7 @@ enum PDF_PAGENODE_TYPE {
PDF_PAGENODE_PAGES,
PDF_PAGENODE_ARRAY,
};
-class CPDF_PageNode : public CFX_Object
+class CPDF_PageNode
{
public:
CPDF_PageNode() : m_type(PDF_PAGENODE_UNKOWN) {}