From 368ed462dd6e5e63977ca2b2e56a7e83b3a3bdda Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 13 Aug 2014 17:12:28 -0700 Subject: Add FX_OVERRIDE and use it for virtual functions of FX_FINAL classes. Should there be cases where this fails to compile, it indicates a mistake, either an incorrectly declared overrriden virtual method, or a method that should be declared non-virtual. The only issues were with CPDF_CustomAccess::GetBlock(), CPDF_CustomAccess::GetByte(), and CPDF_CustomAccess::GetFullPath(). These don't appear to be used anywhere, and are removed. Two members are removed that are no longer needed once those methods are removed. R=jam@chromium.org, jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/454983003 --- core/src/fxge/apple/apple_int.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/src/fxge/apple') diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index a8fbe2fbaa..e3794159b8 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -188,25 +188,25 @@ protected: class CFX_FontProvider FX_FINAL : public IFX_FileRead { public: - virtual void Release() + virtual void Release() FX_OVERRIDE { delete this; } - virtual FX_FILESIZE GetSize() + virtual FX_FILESIZE GetSize() FX_OVERRIDE { return (FX_FILESIZE)_totalSize; } - virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size); + virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE; - virtual FX_BOOL IsEOF() + virtual FX_BOOL IsEOF() FX_OVERRIDE { return _offSet == _totalSize; } - virtual FX_FILESIZE GetPosition() + virtual FX_FILESIZE GetPosition() FX_OVERRIDE { return (FX_FILESIZE)_offSet; } - virtual size_t ReadBlock(void* buffer, size_t size); + virtual size_t ReadBlock(void* buffer, size_t size) FX_OVERRIDE; public: CFX_FontProvider(CGFontRef cgFont); ~CFX_FontProvider(); -- cgit v1.2.3