diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-08 17:25:42 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-08 17:25:42 -0700 |
commit | bf6c2a4873f8cc12ad910fb904218a78087a3735 (patch) | |
tree | 80a54fa87004f3aa065c451f1fb830734b3a6d2d /core/src/fxge/apple | |
parent | 2a824f1c0ed786aed0dd15a0ea60dc90999e2b2c (diff) | |
download | pdfium-bf6c2a4873f8cc12ad910fb904218a78087a3735.tar.xz |
Remove more cruft from fx_system.h
- include system headers first and alphabetize.
- remove unsupported FX_WIN32_MOBILE symbol.
- actually define a FX_WIN64 symbol and make consistent.
- use final/override, not FX_FINAL.
- let stdint.h resolve FX_WORDSIZE concerns.
- unused FX_ERR and FX_SUCCESS() macros.
- unused FX_LSB_FIRST macro.
- outline FX type deprecation plan.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1169963003
Diffstat (limited to 'core/src/fxge/apple')
-rw-r--r-- | core/src/fxge/apple/apple_int.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 5b083d83eb..2466ecbc9a 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -186,28 +186,28 @@ protected: FX_INT32 _horzSize; FX_INT32 _vertSize; }; -class CFX_FontProvider FX_FINAL : public IFX_FileRead +class CFX_FontProvider final : public IFX_FileRead { public: - virtual void Release() FX_OVERRIDE + virtual void Release() override { delete this; } - virtual FX_FILESIZE GetSize() FX_OVERRIDE + virtual FX_FILESIZE GetSize() override { return (FX_FILESIZE)_totalSize; } - virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE; + virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; - virtual FX_BOOL IsEOF() FX_OVERRIDE + virtual FX_BOOL IsEOF() override { return _offSet == _totalSize; } - virtual FX_FILESIZE GetPosition() FX_OVERRIDE + virtual FX_FILESIZE GetPosition() override { return (FX_FILESIZE)_offSet; } - virtual size_t ReadBlock(void* buffer, size_t size) FX_OVERRIDE; + virtual size_t ReadBlock(void* buffer, size_t size) override; public: CFX_FontProvider(CGFontRef cgFont); ~CFX_FontProvider(); |