Merge to XFA: Kill CFX_Object.

core/src/fxcrt/xml_int.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FXCRT_XML_INT_
 #define _FXCRT_XML_INT_
-class CXML_DataBufAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataBufAcc : public IFX_BufferRead
 {
 public:
     CXML_DataBufAcc(FX_LPCBYTE pBuffer, size_t size)
         : m_pBuffer(pBuffer)
         , m_dwSize(size)
         , m_dwCurPos(0)
     {
     }
     virtual ~CXML_DataBufAcc() {}
     virtual void                        Release()
@@ skipping 34 matching lines @@
     virtual FX_FILESIZE         GetBlockOffset()
     {
         return 0;
     }
 protected:
     FX_LPCBYTE          m_pBuffer;
     size_t                      m_dwSize;
     size_t                      m_dwCurPos;
 };
 #define FX_XMLDATASTREAM_BufferSize             (32 * 1024)
-class CXML_DataStmAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataStmAcc : public IFX_BufferRead
 {
 public:
     CXML_DataStmAcc(IFX_FileRead *pFileRead)
         : m_pFileRead(pFileRead)
         , m_pBuffer(NULL)
         , m_nStart(0)
         , m_dwSize(0)
     {
         FXSYS_assert(m_pFileRead != NULL);
     }
@@ skipping 80 matching lines @@
     void                        GetAttrValue(CFX_WideString &value);
     FX_DWORD            GetCharRef();
     void                        GetTagName(CFX_ByteString &space, CFX_ByteString &name, FX_BOOL &bEndTag, FX_BOOL bStartTag = FALSE);
     void                        SkipLiterals(FX_BSTR str);
     CXML_Element*       ParseElement(CXML_Element* pParent, FX_BOOL bStartTag = FALSE);
     void                        InsertContentSegment(FX_BOOL bCDATA, FX_WSTR content, CXML_Element* pElement);
     void                        InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
 };
 void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName);
 #endif