Merge to XFA: Kill CFX_Object.

fpdfsdk/include/fsdk_define.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 _FPDFSDK_DEFINE_H
 #define _FPDFSDK_DEFINE_H
 
 #ifdef _WIN32
@@ skipping 57 matching lines @@
 
 #ifndef FX_COLORREFTOARGB
 /** @brief Convert a #FX_COLORREF to a #FX_ARGB. */
 #define FX_COLORREFTOARGB(rgb)          ((FX_DWORD)0xFF000000|(((FX_DWORD)rgb & 0x000000FF) << 16)|((FX_DWORD)rgb & 0x0000FF00)|(((FX_DWORD)rgb & 0x00FF0000) >> 16))
 #endif
 
 typedef unsigned int FX_UINT;   
 
 #include "fpdfview.h"
 
-class CPDF_CustomAccess FX_FINAL : public IFX_FileRead, public CFX_Object
+class CPDF_CustomAccess FX_FINAL : public IFX_FileRead
 {
 public:
         CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
         ~CPDF_CustomAccess() {}
 
         virtual CFX_ByteString GetFullPath() { return ""; }
         virtual FX_FILESIZE     GetSize() FX_OVERRIDE { return m_FileAccess.m_FileLen; }
 
         virtual FX_BOOL         GetByte(FX_DWORD pos, FX_BYTE& ch);
         virtual FX_BOOL         GetBlock(FX_DWORD pos, FX_LPBYTE pBuf, FX_DWORD size);
         virtual void            Release() FX_OVERRIDE { delete this; }
 
         virtual FX_BOOL         ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE;
 
         FPDF_FILEACCESS         m_FileAccess;
         FX_BYTE                         m_Buffer[512];
         FX_DWORD                        m_BufferOffset;
 };
 
-class CFPDF_FileStream : public IFX_FileStream, public CFX_Object
+class CFPDF_FileStream : public IFX_FileStream
 {
 public:
         CFPDF_FileStream(FPDF_FILEHANDLER* pFS);
         virtual ~CFPDF_FileStream() {}
 
         virtual IFX_FileStream*         Retain();
         virtual void                            Release();
 
         virtual FX_FILESIZE                     GetSize();
         virtual FX_BOOL                         IsEOF();
         virtual FX_FILESIZE                     GetPosition() {return m_nCurPos;}
         virtual void                            SetPosition(FX_FILESIZE pos) {m_nCurPos = pos; }
         virtual FX_BOOL                         ReadBlock(void* buffer, FX_FILESIZE offset, size_t size);
         virtual size_t                          ReadBlock(void* buffer, size_t size);
         virtual FX_BOOL                         WriteBlock(const void* buffer, FX_FILESIZE offset, size_t size);
         virtual FX_BOOL                         Flush();
 
 protected:
         FPDF_FILEHANDLER*       m_pFS;
         FX_FILESIZE             m_nCurPos;
 };
 
 void            FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 FPDF_BOOL       FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
 
 
 #endif//_FPDFSDK_DEFINE_H