From 0cb9b8cb094532ff868314350680d3fb0ca2fe51 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Tue, 10 Jan 2017 16:38:10 -0500
Subject: Strip out custom allocator code

This Cl replaces the custom IFX_MemoryAllocator code with new/delete as needed.

Change-Id: Ie786f607c9e0b3035ffd87733bc3e29a4b6426d9
Reviewed-on: https://pdfium-review.googlesource.com/2164
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 xfa/fde/xml/fde_xml_imp.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'xfa/fde/xml/fde_xml_imp.h')

diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h
index 126b0355a3..49c5c51f77 100644
--- a/xfa/fde/xml/fde_xml_imp.h
+++ b/xfa/fde/xml/fde_xml_imp.h
@@ -12,7 +12,6 @@
 
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fde/xml/fde_xml.h"
-#include "xfa/fgas/crt/fgas_memory.h"
 #include "xfa/fgas/crt/fgas_stream.h"
 #include "xfa/fgas/crt/fgas_utils.h"
 
@@ -25,7 +24,7 @@ class CFDE_XMLDOMParser;
 class CFDE_XMLSyntaxParser;
 class IFDE_XMLParser;
 
-class CFDE_XMLNode : public CFX_Target {
+class CFDE_XMLNode {
  public:
   enum NodeItem {
     Root = 0,
@@ -43,7 +42,7 @@ class CFDE_XMLNode : public CFX_Target {
   };
 
   CFDE_XMLNode();
-  ~CFDE_XMLNode() override;
+  virtual ~CFDE_XMLNode();
 
   virtual void Release();
   virtual FDE_XMLNODETYPE GetType() const;
@@ -191,10 +190,10 @@ class CFDE_XMLCharData : public CFDE_XMLDeclaration {
   CFX_WideString m_wsCharData;
 };
 
-class CFDE_XMLDoc : public CFX_Target {
+class CFDE_XMLDoc {
  public:
   CFDE_XMLDoc();
-  ~CFDE_XMLDoc() override;
+  ~CFDE_XMLDoc();
 
   bool LoadXML(std::unique_ptr<IFDE_XMLParser> pXMLParser);
   int32_t DoLoad(IFX_Pause* pPause = nullptr);
@@ -221,10 +220,10 @@ class IFDE_XMLParser {
   virtual int32_t DoParser(IFX_Pause* pPause) = 0;
 };
 
-class CFDE_BlockBuffer : public CFX_Target {
+class CFDE_BlockBuffer {
  public:
   explicit CFDE_BlockBuffer(int32_t iAllocStep = 1024 * 1024);
-  ~CFDE_BlockBuffer() override;
+  ~CFDE_BlockBuffer();
 
   bool InitBuffer(int32_t iBufferSize = 1024 * 1024);
   bool IsInitialized() { return m_iBufferSize / m_iAllocStep >= 1; }
@@ -257,10 +256,10 @@ class CFDE_BlockBuffer : public CFX_Target {
   int32_t m_iStartPosition;
 };
 
-class CFDE_XMLSyntaxParser : public CFX_Target {
+class CFDE_XMLSyntaxParser {
  public:
   CFDE_XMLSyntaxParser();
-  ~CFDE_XMLSyntaxParser() override;
+  ~CFDE_XMLSyntaxParser();
 
   void Release() { delete this; }
   void Init(const CFX_RetainPtr<IFGAS_Stream>& pStream,
-- 
cgit v1.2.3