Merge to XFA: Remove more cruft from fx_system.h

New manual edits in the following to fix compilation:
  fx_bmp.h, fx_gif.h, fx_graphics.h

Original Review URL: https://codereview.chromium.org/1169963003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1170103004

5 files changed, 20 insertions, 22 deletions

diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 528801795b..fd6beca527 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -75,20 +75,19 @@ typedef unsigned int FX_UINT;
 
 #include "../../public/fpdfview.h"
 
-class CPDF_CustomAccess FX_FINAL : public IFX_FileRead
+class CPDF_CustomAccess 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 CFX_ByteString GetFullPath() { return ""; }
+	virtual FX_FILESIZE	GetSize() 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;
+	virtual void		Release() override { delete this; }
+	virtual FX_BOOL		ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
 
 	FPDF_FILEACCESS		m_FileAccess;
 	FX_BYTE				m_Buffer[512];
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 7f68dd9cca..d90ab3be4f 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -30,7 +30,7 @@ class CJS_RuntimeFactory;
 
 #include "javascript/IJavaScript.h"
 
-class CPDFDoc_Environment FX_FINAL
+class CPDFDoc_Environment final
 {
 public:
 	CPDFDoc_Environment(CPDFXFA_Document * pDoc);
@@ -763,8 +763,7 @@ private:
 	CPDF_OCContext *		m_pOccontent;
 	FX_BOOL					m_bChangeMask;
 };
-
-class CPDFSDK_PageView FX_FINAL
+class CPDFSDK_PageView final
 {
 public:
 	CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDFXFA_Page* page);
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index f73a7701dc..4d77794768 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -8,19 +8,19 @@
 #include "../include/fsdk_define.h"
 #include "../include/pdfwindow/PWL_FontMap.h"
 
-class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo
+class CSysFontInfo_Ext final : public IFX_SystemFontInfo
 {
 public:
 	FPDF_SYSFONTINFO*	m_pInfo;
 
-	virtual void		Release() FX_OVERRIDE
+	virtual void		Release() override
 	{
 		if (m_pInfo->Release)
 			m_pInfo->Release(m_pInfo);
 		delete this;
 	}
 
-	virtual	FX_BOOL		EnumFontList(CFX_FontMapper* pMapper) FX_OVERRIDE
+	virtual	FX_BOOL		EnumFontList(CFX_FontMapper* pMapper) override
 	{
 		if (m_pInfo->EnumFonts) {
 			m_pInfo->EnumFonts(m_pInfo, pMapper);
@@ -29,28 +29,28 @@ public:
 		return FALSE;
 	}
 
-	virtual void*		MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact)  FX_OVERRIDE
+	virtual void*		MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact)  override
 	{
 		if (m_pInfo->MapFont)
 			return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &bExact);
 		return NULL;
 	}
 
-	virtual void*		GetFont(FX_LPCSTR family)  FX_OVERRIDE
+	virtual void*		GetFont(FX_LPCSTR family)  override
 	{
 		if (m_pInfo->GetFont)
 			return m_pInfo->GetFont(m_pInfo, family);
 		return NULL;
 	}
 
-	virtual FX_DWORD	GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)  FX_OVERRIDE
+	virtual FX_DWORD	GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)  override
 	{
 		if (m_pInfo->GetFontData)
 			return m_pInfo->GetFontData(m_pInfo, hFont, table, buffer, size);
 		return 0;
 	}
 
-	virtual FX_BOOL		GetFaceName(void* hFont, CFX_ByteString& name)  FX_OVERRIDE
+	virtual FX_BOOL		GetFaceName(void* hFont, CFX_ByteString& name)  override
 	{
 		if (m_pInfo->GetFaceName == NULL) return FALSE;
 		FX_DWORD size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0);
@@ -62,7 +62,7 @@ public:
 		return TRUE;
 	}
 
-	virtual FX_BOOL		GetFontCharset(void* hFont, int& charset)  FX_OVERRIDE
+	virtual FX_BOOL		GetFontCharset(void* hFont, int& charset)  override
 	{
 		if (m_pInfo->GetFontCharset) {
 			charset = m_pInfo->GetFontCharset(m_pInfo, hFont);
@@ -71,7 +71,7 @@ public:
 		return FALSE;
 	}
 
-	virtual void		DeleteFont(void* hFont)  FX_OVERRIDE
+	virtual void		DeleteFont(void* hFont)  override
 	{
 		if (m_pInfo->DeleteFont)
 			m_pInfo->DeleteFont(m_pInfo, hFont);
diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp
index b3ab2f0df9..db9e289d9e 100644
--- a/fpdfsdk/src/fpdfsave.cpp
+++ b/fpdfsdk/src/fpdfsave.cpp
@@ -18,14 +18,14 @@
 #include <ctime>
 #endif
 
-class CFX_IFileWrite FX_FINAL : public IFX_StreamWrite
+class CFX_IFileWrite final : public IFX_StreamWrite
 {
 	
 public:
 	CFX_IFileWrite();
 	FX_BOOL				Init( FPDF_FILEWRITE * pFileWriteStruct );
-	virtual	FX_BOOL		WriteBlock(const void* pData, size_t size) FX_OVERRIDE;
-	virtual void		Release() FX_OVERRIDE {}
+	virtual	FX_BOOL		WriteBlock(const void* pData, size_t size) override;
+	virtual void		Release() override {}
 	
 protected:
 	FPDF_FILEWRITE*		m_pFileWriteStruct;
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 3d26efa11c..7e68740e59 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -299,7 +299,7 @@ DLLEXPORT  FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document)
 
 extern void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code);
 
-class CMemFile FX_FINAL: public IFX_FileRead
+class CMemFile final : public IFX_FileRead
 {
 public:
 	CMemFile(FX_BYTE* pBuf, FX_FILESIZE size):m_pBuf(pBuf),m_size(size) {}