From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/src/fxcrt/extension.h | 6 +++--- core/src/fxcrt/fx_arabic.h | 4 ++-- core/src/fxcrt/fx_basic_util.cpp | 2 +- core/src/fxcrt/fxcrt_platforms.h | 2 +- core/src/fxcrt/fxcrt_posix.h | 2 +- core/src/fxcrt/fxcrt_windows.h | 2 +- core/src/fxcrt/xml_int.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h index bf60292a4d..bda7f62297 100644 --- a/core/src/fxcrt/extension.h +++ b/core/src/fxcrt/extension.h @@ -28,7 +28,7 @@ public: virtual FX_BOOL Truncate(FX_FILESIZE szFile) = 0; }; IFXCRT_FileAccess* FXCRT_FileAccess_Create(); -class CFX_CRTFileAccess : public IFX_FileAccess, public CFX_Object +class CFX_CRTFileAccess : public IFX_FileAccess { public: CFX_CRTFileAccess() : m_RefCount(0) {} @@ -66,7 +66,7 @@ protected: CFX_WideString m_path; FX_DWORD m_RefCount; }; -class CFX_CRTFileStream FX_FINAL : public IFX_FileStream, public CFX_Object +class CFX_CRTFileStream FX_FINAL : public IFX_FileStream { public: CFX_CRTFileStream(IFXCRT_FileAccess* pFA) : m_pFile(pFA), m_dwCount(1), m_bUseRange(FALSE), m_nOffset(0), m_nSize(0) {} @@ -171,7 +171,7 @@ public: #define FX_MEMSTREAM_BlockSize (64 * 1024) #define FX_MEMSTREAM_Consecutive 0x01 #define FX_MEMSTREAM_TakeOver 0x02 -class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream, public CFX_Object +class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream { public: CFX_MemoryStream(FX_BOOL bConsecutive) diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index f55f7c60cf..eb05801849 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -10,7 +10,7 @@ typedef struct _FX_ARABICCHARRANGE { FX_WCHAR wStart; FX_WCHAR wEnd; } FX_ARABICCHARRANGE; -class CFX_ArabicChar : public IFX_ArabicChar, public CFX_Object +class CFX_ArabicChar : public IFX_ArabicChar { public: virtual void Release() @@ -179,7 +179,7 @@ void FX_BidiResolveImplicit(const CFX_Int32Array &classes, CFX_Int32Array &level void FX_BidiResolveWhitespace(FX_INT32 iBaseLevel, const CFX_Int32Array &classes, CFX_Int32Array &levels); FX_INT32 FX_BidiReorderLevel(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels, FX_INT32 iStart, FX_BOOL bReverse = FALSE); void FX_BidiReorder(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels); -class CFX_BidiChar : public IFX_BidiChar, public CFX_Object +class CFX_BidiChar FX_FINAL : public IFX_BidiChar { public: CFX_BidiChar(); diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp index c3df07fef5..272d43eef7 100644 --- a/core/src/fxcrt/fx_basic_util.cpp +++ b/core/src/fxcrt/fx_basic_util.cpp @@ -294,7 +294,7 @@ CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI) return CFX_WideString::FromUTF8(rURI, rURI.GetLength()); } #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -class CFindFileData : public CFX_Object +class CFindFileData { public: virtual ~CFindFileData() {} diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h index dbdff6aba0..dbfa58be1a 100644 --- a/core/src/fxcrt/fxcrt_platforms.h +++ b/core/src/fxcrt/fxcrt_platforms.h @@ -10,7 +10,7 @@ #if _FX_OS_ == _FX_ANDROID_ void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode); void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode); -class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess, public CFX_Object +class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess { public: CFXCRT_FileAccess_CRT(); diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h index db4377f5f2..89162cd037 100644 --- a/core/src/fxcrt/fxcrt_posix.h +++ b/core/src/fxcrt/fxcrt_posix.h @@ -8,7 +8,7 @@ #define _FXCRT_LINUX_ #include "extension.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ -class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess, public CFX_Object +class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess { public: CFXCRT_FileAccess_Posix(); diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h index 39d72554da..92646b2757 100644 --- a/core/src/fxcrt/fxcrt_windows.h +++ b/core/src/fxcrt/fxcrt_windows.h @@ -8,7 +8,7 @@ #define _FXCRT_WINDOWS_ #include "extension.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess, public CFX_Object +class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess { public: CFXCRT_FileAccess_Win64(); diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h index 1f75928e51..964c7944d1 100644 --- a/core/src/fxcrt/xml_int.h +++ b/core/src/fxcrt/xml_int.h @@ -6,7 +6,7 @@ #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) @@ -61,7 +61,7 @@ protected: 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) -- cgit v1.2.3